From b50a9db5ca574a7475caf370679cff6ec89b9945 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 19 Jul 2024 11:08:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1?= =?UTF-8?q?=E5=88=92):=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardMasterPlanServiceImpl.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java index 4fea85dc..5d384d12 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java @@ -138,12 +138,22 @@ public class LawsStandardMasterPlanServiceImpl String type = lawsStandardMasterPlanSublist.getType(); switch (type) { case LawsStandardMasterPlanCommon.INTERPRETATION_OF_REGULATIONS: - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getPrcType, "2") - .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue()) - .orderByAsc(ProcessAll::getCreateTime).last("limit 1")); - if (!Objects.isNull(processAll)){ - lawsStandardMasterPlanSublist.setAssociationId(processAll.getId()); + List list = processStandardInterpretService.list( + new LambdaQueryWrapper() + .eq(ProcessStandardInterpret::getStandardId, + lawsStandardMasterPlan.getStandardId())); + if (CollectionUtils.isNotEmpty(list)){ + List projectIdList = list.stream() + .map(ProcessStandardInterpret::getProjectId) + .collect(Collectors.toList()); + ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() + .in(ProcessAll::getProjectId, projectIdList) + .eq(ProcessAll::getPrcType, "2") + .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue()) + .orderByAsc(ProcessAll::getCreateTime).last("limit 1")); + if (!Objects.isNull(processAll)){ + lawsStandardMasterPlanSublist.setAssociationId(processAll.getId()); + } } break; case LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE: @@ -247,23 +257,16 @@ public class LawsStandardMasterPlanServiceImpl new LambdaQueryWrapper() .eq(ProcessNewStandardImport::getStandardId, lawsStandardMasterPlan.getStandardId()) .eq(ProcessNewStandardImport::getApplicableMarket, - lawsStandardMasterPlan.getApplicableMarket()) - .orderByAsc(ProcessNewStandardImport::getCreateTime)); + lawsStandardMasterPlan.getApplicableMarket())); if (CollectionUtils.isNotEmpty(list1)){ - ProcessNewStandardImport processNewStandardImport = list1.get(0); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProcessInstanceId, - processNewStandardImport.getProcessInstanceId()) - .eq(ProcessAll::getPrcStatus,ProcessStatusEnum.COMPLETED.getValue())); - if (!Objects.isNull(processAll)){ - lawsStandardMasterPlanSublist.setActualCompletionDate(processAll.getEndTime()); - } - List processInstanceIdList = list1.stream() .map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList()); List processAllList = processAllService.list(new LambdaQueryWrapper() - .in(ProcessAll::getProcessInstanceId, processInstanceIdList)); + .in(ProcessAll::getProcessInstanceId, processInstanceIdList) + .orderByAsc(ProcessAll::getEndTime)); if (CollectionUtils.isNotEmpty(processAllList)){ + ProcessAll processAll = processAllList.get(0); + lawsStandardMasterPlanSublist.setActualCompletionDate(processAll.getEndTime()); lawsStandardMasterPlanSublist.setProcessAllList(processAllList); } }