QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准主计划): 完善

Browse Source
This commit is contained in:
yjz
2024-07-31 18:18:24 +08:00
parent 5cf20e4295
commit 0a4ad59d26
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java
+23 -17
View File
@@ -113,8 +113,11 @@ public class LawsStandardMasterPlanServiceImpl
"lds.standard_number", lawsStandardMasterPlanVO.getStandardNumber()); "lds.standard_number", lawsStandardMasterPlanVO.getStandardNumber());
queryWrapper.like(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getStandardName()), queryWrapper.like(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getStandardName()),
"lds.standard_name", lawsStandardMasterPlanVO.getStandardName()); "lds.standard_name", lawsStandardMasterPlanVO.getStandardName());
queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getApplicableMarket()), if (StringUtils.isNotBlank(lawsStandardMasterPlanVO.getApplicableMarket())){
"lsmp.applicable_market", lawsStandardMasterPlanVO.getApplicableMarket()); List<String> list2 = Arrays.asList(lawsStandardMasterPlanVO.getApplicableMarket().split(","));
queryWrapper.and(query -> list2.forEach(item ->
query.or(qw -> qw.gt("find_in_set('" + item + "', lsmp.applicable_market)", 0))));
}
queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()), queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()),
"lsmp.id", lawsStandardMasterPlanVO.getId()); "lsmp.id", lawsStandardMasterPlanVO.getId());
queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0); queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0);
@@ -129,6 +132,7 @@ public class LawsStandardMasterPlanServiceImpl
LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan();
lawsStandardMasterPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); lawsStandardMasterPlan.setId(String.valueOf(SnowflakeUtils.snowflake()));
lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId());
lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket());
save(lawsStandardMasterPlan); save(lawsStandardMasterPlan);
// 保存 标准主计划_子表信息 // 保存 标准主计划_子表信息
@@ -183,6 +187,7 @@ public class LawsStandardMasterPlanServiceImpl
lawsStandardMasterPlanDetailsVO.setLawsStandardMasterPlanVO(queryByList(lawsStandardMasterPlanVO).get(0)); lawsStandardMasterPlanDetailsVO.setLawsStandardMasterPlanVO(queryByList(lawsStandardMasterPlanVO).get(0));
LawsStandardMasterPlanVO lawsStandardMasterPlan = LawsStandardMasterPlanVO lawsStandardMasterPlan =
lawsStandardMasterPlanDetailsVO.getLawsStandardMasterPlanVO(); lawsStandardMasterPlanDetailsVO.getLawsStandardMasterPlanVO();
String applicableMarket = lawsStandardMasterPlan.getApplicableMarket();
LawsDomesticStandard lawsDomesticStandard = LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.getById(lawsStandardMasterPlan.getStandardId()); lawsDomesticStandardService.getById(lawsStandardMasterPlan.getStandardId());
@@ -207,18 +212,18 @@ public class LawsStandardMasterPlanServiceImpl
break; break;
// 导入通知 // 导入通知
case LawsStandardMasterPlanCommon.IMPORT_NOTIFICATION: case LawsStandardMasterPlanCommon.IMPORT_NOTIFICATION:
List<ProcessNewStandardImport> list1 = processNewStandardImportService.list( QueryWrapper<ProcessNewStandardImport> queryWrapper = new QueryWrapper<>();
new LambdaQueryWrapper<ProcessNewStandardImport>() queryWrapper.eq("standard_id", lawsDomesticStandard.getId());
.eq(ProcessNewStandardImport::getStandardId, lawsStandardMasterPlan.getStandardId()) if (StringUtils.isNotBlank(lawsStandardMasterPlan.getApplicableMarket())){
.eq(ProcessNewStandardImport::getApplicableMarket, queryWrapper.gt("find_in_set('" + applicableMarket + "', applicable_market)", 0);
lawsStandardMasterPlan.getApplicableMarket())); }
List<ProcessNewStandardImport> list1 = processNewStandardImportService.list(queryWrapper);
if (CollectionUtils.isNotEmpty(list1)){ if (CollectionUtils.isNotEmpty(list1)){
List<String> processInstanceIdList = list1.stream() List<String> processInstanceIdList = list1.stream()
.map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList()); .map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList());
List<ProcessAll> processAllList = processAllService.list(new LambdaQueryWrapper<ProcessAll>() List<ProcessAll> processAllList = processAllService.list(new LambdaQueryWrapper<ProcessAll>()
.in(ProcessAll::getProcessInstanceId, processInstanceIdList) .in(ProcessAll::getProcessInstanceId, processInstanceIdList)
.orderByAsc(ProcessAll::getEndTime) .orderByAsc(ProcessAll::getEndTime));
.last("limit 1"));
if (CollectionUtils.isNotEmpty(processAllList)){ if (CollectionUtils.isNotEmpty(processAllList)){
ProcessAll processAll = processAllList.get(0); ProcessAll processAll = processAllList.get(0);
lawsStandardMasterPlanSublist.setActualCompletionDate(processAll.getEndTime()); lawsStandardMasterPlanSublist.setActualCompletionDate(processAll.getEndTime());
@@ -448,7 +453,7 @@ public class LawsStandardMasterPlanServiceImpl
MarketStandardConstants.MANIFEST_STATUS_PUBLISH); MarketStandardConstants.MANIFEST_STATUS_PUBLISH);
lawsMarketStandardQueryWrapper.orderByAsc("create_time").last("limit 1"); lawsMarketStandardQueryWrapper.orderByAsc("create_time").last("limit 1");
if (StringUtils.isNotBlank(applicableMarket)){ if (StringUtils.isNotBlank(applicableMarket)){
lawsMarketStandardQueryWrapper.gt("find_in_set('" + applicableMarket + "', getCountry)", 0); lawsMarketStandardQueryWrapper.gt("find_in_set('" + applicableMarket + "', country)", 0);
} }
// 根据适用市场查询获取最早发布的市场法规清单 // 根据适用市场查询获取最早发布的市场法规清单
LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper); LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper);
@@ -479,17 +484,18 @@ public class LawsStandardMasterPlanServiceImpl
// 导入通知 // 导入通知
LawsStandardMasterPlanSublist masterPlanSublist = new LawsStandardMasterPlanSublist(); LawsStandardMasterPlanSublist masterPlanSublist = new LawsStandardMasterPlanSublist();
masterPlanSublist.setType(LawsStandardMasterPlanCommon.IMPORT_NOTIFICATION); masterPlanSublist.setType(LawsStandardMasterPlanCommon.IMPORT_NOTIFICATION);
List<ProcessNewStandardImport> list1 = processNewStandardImportService.list( QueryWrapper<ProcessNewStandardImport> queryWrapper = new QueryWrapper<>();
new LambdaQueryWrapper<ProcessNewStandardImport>() queryWrapper.eq("standard_id", standardId);
.eq(ProcessNewStandardImport::getStandardId, standardId) if (StringUtils.isNotBlank(applicableMarket)){
.eq(ProcessNewStandardImport::getApplicableMarket, applicableMarket)); queryWrapper.gt("find_in_set('" + applicableMarket + "', applicable_market)", 0);
}
List<ProcessNewStandardImport> list1 = processNewStandardImportService.list(queryWrapper);
if (CollectionUtils.isNotEmpty(list1)){ if (CollectionUtils.isNotEmpty(list1)){
List<String> processInstanceIdList = list1.stream() List<String> processInstanceIdList = list1.stream()
.map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList()); .map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList());
List<ProcessAll> processAllList = processAllService.list(new LambdaQueryWrapper<ProcessAll>() List<ProcessAll> processAllList = processAllService.list(new LambdaQueryWrapper<ProcessAll>()
.in(ProcessAll::getProcessInstanceId, processInstanceIdList) .in(ProcessAll::getProcessInstanceId, processInstanceIdList)
.orderByAsc(ProcessAll::getEndTime) .orderByAsc(ProcessAll::getEndTime));
.last("limit 1"));
if (CollectionUtils.isNotEmpty(processAllList)){ if (CollectionUtils.isNotEmpty(processAllList)){
ProcessAll processAll = processAllList.get(0); ProcessAll processAll = processAllList.get(0);
masterPlanSublist.setActualCompletionDate(processAll.getEndTime()); masterPlanSublist.setActualCompletionDate(processAll.getEndTime());
@@ -536,7 +542,7 @@ public class LawsStandardMasterPlanServiceImpl
if (StringUtils.isNotBlank(applicableMarket)){ if (StringUtils.isNotBlank(applicableMarket)){
List<String> list2 = Arrays.asList(applicableMarket.split(",")); List<String> list2 = Arrays.asList(applicableMarket.split(","));
lawsMarketStandardQueryWrapper.and(query -> list2.forEach(item -> lawsMarketStandardQueryWrapper.and(query -> list2.forEach(item ->
query.or(qw -> qw.gt("find_in_set('" + item + "', getCountry)", 0)))); query.or(qw -> qw.gt("find_in_set('" + item + "', country)", 0))));
} }
// 根据适用市场查询获取最早发布的市场法规清单 // 根据适用市场查询获取最早发布的市场法规清单
LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper); LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper);