From cdbf583d6f600d591995107eb926ee2b09c53d64 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 30 Jul 2024 10:46:00 +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 --- .../service/impl/LawsCommonServiceImpl.java | 11 +++++++++- .../common/vo/ManyStandardSelectionBox.java | 3 +++ .../LawsStandardMasterPlanServiceImpl.java | 22 ++++++++++++++----- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index b627d952..340c294d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1386,7 +1386,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Override public IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo, pageSize); - return lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO); + IPage manyStandardSelectionBox = lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO); + for (ManyStandardSelectionBox data : manyStandardSelectionBox.getRecords()) { + if (StringUtils.isNotBlank(data.getCreateBy())) { + SysUser sysUser = sysUserService.getUserByName(data.getCreateBy()); + if (sysUser != null) { + data.setCreateBy_dictText(sysUser.calcNameWorkNo()); + } + } + } + return manyStandardSelectionBox; } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java index d3937e65..fa34544a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java @@ -53,7 +53,10 @@ public class ManyStandardSelectionBox { private java.lang.String splitInfoId; @ApiModelProperty(value = "创建人") private java.lang.String createBy; + @ApiModelProperty(value = "创建人 翻译") + private java.lang.String createBy_dictText; @ApiModelProperty(value = "责任人") + @Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id") private java.lang.String responsibleUser; public void setStandardState(String standardState) { 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 a0fb0eaf..bec712dd 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 @@ -388,12 +388,14 @@ public class LawsStandardMasterPlanServiceImpl List standardMasterPlanList = list(new LambdaUpdateWrapper() .eq(LawsStandardMasterPlan::getStandardId, standardId)); if (!CollectionUtils.isEmpty(standardMasterPlanList)){ + // 更新标准主计划数据 List idList = standardMasterPlanList.stream() .map(LawsStandardMasterPlan::getId).collect(Collectors.toList()); lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper() .in(LawsStandardMasterPlanSublist::getMasterPlanId, idList) .eq(LawsStandardMasterPlanSublist::getType, LawsStandardMasterPlanCommon.INTERPRETATION_OF_REGULATIONS) + .isNull(LawsStandardMasterPlanSublist::getAssociationId) .set(LawsStandardMasterPlanSublist::getAssociationId, processAll.getId())); } } @@ -411,12 +413,14 @@ public class LawsStandardMasterPlanServiceImpl lawsStandardMasterPlanVO.setApplicableMarket(applicableMarket); List lawsStandardMasterPlanVOList = queryByList(lawsStandardMasterPlanVO); if (CollectionUtils.isNotEmpty(lawsStandardMasterPlanVOList)){ + // 更新标准主计划数据 List idList = lawsStandardMasterPlanVOList.stream() .map(LawsStandardMasterPlanVO::getId).collect(Collectors.toList()); lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper() .in(LawsStandardMasterPlanSublist::getMasterPlanId, idList) .eq(LawsStandardMasterPlanSublist::getType, LawsStandardMasterPlanCommon.REGULATORY_COMPLIANCE_INVESTIGATION) + .isNull(LawsStandardMasterPlanSublist::getAssociationId) .set(LawsStandardMasterPlanSublist::getAssociationId, lawsConformityAssessmentLibrary.getId())); } } @@ -431,11 +435,19 @@ public class LawsStandardMasterPlanServiceImpl .eq(LawsMarketStandard::getManifestStatus, MarketStandardConstants.MANIFEST_STATUS_PUBLISH) .orderByAsc(LawsMarketStandard::getCreateTime).last("limit 1")); if (!Objects.isNull(lawsMarketStandard) && lawsMarketStandard.getId().equals(id)){ - lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper() - .eq(LawsStandardMasterPlanSublist::getType, - LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE) - .isNull(LawsStandardMasterPlanSublist::getAssociationId) - .set(LawsStandardMasterPlanSublist::getAssociationId, lawsMarketStandard.getId())); + // 更新标准主计划数据 + List standardMasterPlanList = list(new LambdaUpdateWrapper() + .eq(LawsStandardMasterPlan::getApplicableMarket, applicableMarkets)); + if (CollectionUtils.isNotEmpty(standardMasterPlanList)){ + List idList = standardMasterPlanList.stream() + .map(LawsStandardMasterPlan::getId).collect(Collectors.toList()); + lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper() + .in(LawsStandardMasterPlanSublist::getMasterPlanId, idList) + .eq(LawsStandardMasterPlanSublist::getType, + LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE) + .isNull(LawsStandardMasterPlanSublist::getAssociationId) + .set(LawsStandardMasterPlanSublist::getAssociationId, lawsMarketStandard.getId())); + } } }