@@ -265,11 +265,11 @@ public class ProjectConvert { | |||||
req.setBaseProjName(approve.getBaseProjName()); | req.setBaseProjName(approve.getBaseProjName()); | ||||
req.setOp(approve.getOp()); | req.setOp(approve.getOp()); | ||||
req.setApprovalFile(StringUtils.isNotBlank(approve.getApprovalFilePdf()) ? approve.getApprovalFilePdf() : | req.setApprovalFile(StringUtils.isNotBlank(approve.getApprovalFilePdf()) ? approve.getApprovalFilePdf() : | ||||
approve.getApprovalFile()); | |||||
null); | |||||
req.setBaseReviewCommentsFile(StringUtils.isNotBlank(approve.getBaseReviewCommentsFilePdf()) ? approve.getBaseReviewCommentsFilePdf(): | req.setBaseReviewCommentsFile(StringUtils.isNotBlank(approve.getBaseReviewCommentsFilePdf()) ? approve.getBaseReviewCommentsFilePdf(): | ||||
approve.getBaseReviewCommentsFile()); | |||||
null); | |||||
req.setPreliminaryDesignFile(StringUtils.isNotBlank(approve.getPreliminaryDesignFilePdf()) ? approve.getPreliminaryDesignFilePdf() : | req.setPreliminaryDesignFile(StringUtils.isNotBlank(approve.getPreliminaryDesignFilePdf()) ? approve.getPreliminaryDesignFilePdf() : | ||||
approve.getPreliminaryDesignFile()); | |||||
null); | |||||
req.setAreaCode(approve.getAreaCode()); | req.setAreaCode(approve.getAreaCode()); | ||||
req.setBaseDevelopCode(approve.getBaseDevelopCode()); | req.setBaseDevelopCode(approve.getBaseDevelopCode()); | ||||
req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null); | req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null); | ||||
@@ -189,20 +189,20 @@ public class SynProjectCollectionTask { | |||||
ProjectListReq req = new ProjectListReq(); | ProjectListReq req = new ProjectListReq(); | ||||
req.setPageNumber(1); | req.setPageNumber(1); | ||||
req.setPageSize(BizConst.MAX_EXPORT_COUNT); | req.setPageSize(BizConst.MAX_EXPORT_COUNT); | ||||
List<GovBizProjectProcure> procures = procureService.list(Wrappers.lambdaQuery(GovBizProjectProcure.class) | |||||
.eq(GovBizProjectProcure::getDeleted,Boolean.FALSE) | |||||
.eq(StringUtils.isNotBlank(projId),GovBizProjectProcure::getBaseProjId,projId) | |||||
.isNotNull(GovBizProjectProcure::getPurchaseFile) | |||||
.isNull(GovBizProjectProcure::getPurchaseFilePdf)); | |||||
List<GovBizProjectApprove> approves = approveService.list(Wrappers.lambdaQuery(GovBizProjectApprove.class) | |||||
.eq(GovBizProjectApprove::getDeleted,Boolean.FALSE) | |||||
.eq(StringUtils.isNotBlank(projId),GovBizProjectApprove::getBaseProjId,projId) | |||||
.isNotNull(GovBizProjectApprove::getApprovalFile) | |||||
.isNull(GovBizProjectApprove::getApprovalFilePdf)); | |||||
if(CollUtil.isEmpty(procures)){ | |||||
log.info("没有项目归集 采购信息 任务终止"); | |||||
if(CollUtil.isEmpty(approves)){ | |||||
log.info("没有项目归集 审批信息 立项文件 任务终止"); | |||||
return; | return; | ||||
} | } | ||||
for(GovBizProjectProcure procure : procures){ | |||||
for(GovBizProjectApprove approve : approves){ | |||||
//开始转换PDF | //开始转换PDF | ||||
convertPdfVo(procure.getBaseProjId()); | |||||
convertPdfVo(approve.getBaseProjId()); | |||||
} | } | ||||
stopWatch.stop(); | stopWatch.stop(); | ||||