@@ -124,18 +124,18 @@ 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<GovBizProjectApprove> projects = approveService.list(Wrappers.lambdaQuery(GovBizProjectApprove.class) | |||||
.eq(GovBizProjectApprove::getDeleted,Boolean.FALSE) | |||||
.eq(StringUtils.isNotBlank(projId),GovBizProjectApprove::getBaseProjId,projId) | |||||
.isNotNull(GovBizProjectApprove::getBaseReviewCommentsFile) | |||||
.isNull(GovBizProjectApprove::getBaseReviewCommentsFilePdf)); | |||||
List<GovBizProjectApply> projects = applyService.list(Wrappers.lambdaQuery(GovBizProjectApply.class) | |||||
.eq(GovBizProjectApply::getDeleted,Boolean.FALSE) | |||||
.eq(StringUtils.isNotBlank(projId),GovBizProjectApply::getBaseProjId,projId) | |||||
.isNotNull(GovBizProjectApply::getBaseProjBasisFile) | |||||
.isNull(GovBizProjectApply::getBaseProjBasisFilePdf)); | |||||
if(CollUtil.isEmpty(projects)){ | if(CollUtil.isEmpty(projects)){ | ||||
log.info("没有项目归集 任务终止"); | log.info("没有项目归集 任务终止"); | ||||
return; | return; | ||||
} | } | ||||
for(GovBizProjectApprove project : projects){ | |||||
for(GovBizProjectApply project : projects){ | |||||
//开始转换PDF | //开始转换PDF | ||||
convertPdfVo(project.getBaseProjId()); | convertPdfVo(project.getBaseProjId()); | ||||
} | } | ||||
@@ -52,7 +52,7 @@ spring: | |||||
# 是允许连接在连接池中空闲的最长时间 | # 是允许连接在连接池中空闲的最长时间 | ||||
minimum-idle: 10 | minimum-idle: 10 | ||||
# 配置最大池大小 | # 配置最大池大小 | ||||
maximum-pool-size: 20 | |||||
maximum-pool-size: 200 | |||||
# 是允许连接在连接池中空闲的最长时间(以毫秒为单位) | # 是允许连接在连接池中空闲的最长时间(以毫秒为单位) | ||||
idle-timeout: 60000 | idle-timeout: 60000 | ||||
# 池中连接关闭后的最长生命周期(以毫秒为单位) | # 池中连接关闭后的最长生命周期(以毫秒为单位) | ||||
@@ -52,7 +52,7 @@ spring: | |||||
# 是允许连接在连接池中空闲的最长时间 | # 是允许连接在连接池中空闲的最长时间 | ||||
minimum-idle: 10 | minimum-idle: 10 | ||||
# 配置最大池大小 | # 配置最大池大小 | ||||
maximum-pool-size: 20 | |||||
maximum-pool-size: 200 | |||||
# 是允许连接在连接池中空闲的最长时间(以毫秒为单位) | # 是允许连接在连接池中空闲的最长时间(以毫秒为单位) | ||||
idle-timeout: 60000 | idle-timeout: 60000 | ||||
# 池中连接关闭后的最长生命周期(以毫秒为单位) | # 池中连接关闭后的最长生命周期(以毫秒为单位) | ||||
@@ -75,7 +75,9 @@ public class ProjectCollectionTest extends AppTests { | |||||
@Test | @Test | ||||
public void test(){ | public void test(){ | ||||
List<String> baseProjIds = Lists.newArrayList("33110000020210100194","33110000020220100194"); | |||||
List<String> baseProjIds = Lists.newArrayList("33110000020110100001", | |||||
"33110000020210200202","33110000020220100223", | |||||
"33110000020210100201","3311000000002022200138"); | |||||
for(String baseProjId : baseProjIds){ | for(String baseProjId : baseProjIds){ | ||||
GovBizProjectBaseinfo baseinfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class) | GovBizProjectBaseinfo baseinfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class) | ||||
.eq(GovBizProjectBaseinfo::getBaseProjId, baseProjId) | .eq(GovBizProjectBaseinfo::getBaseProjId, baseProjId) | ||||