fix(标准主计划): 完善

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<ManyStandardSelectionBox> getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) {
         Page<ManyStandardSelectionBox> page = new Page<>(pageNo, pageSize);
-        return lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO);
+        IPage<ManyStandardSelectionBox> 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;
     }
 
     /**

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) {

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java

@@ -388,12 +388,14 @@ public class LawsStandardMasterPlanServiceImpl
             List<LawsStandardMasterPlan> standardMasterPlanList = list(new LambdaUpdateWrapper<LawsStandardMasterPlan>()
                     .eq(LawsStandardMasterPlan::getStandardId, standardId));
             if (!CollectionUtils.isEmpty(standardMasterPlanList)){
+                // 更新标准主计划数据
                 List<String> idList = standardMasterPlanList.stream()
                         .map(LawsStandardMasterPlan::getId).collect(Collectors.toList());
                 lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper<LawsStandardMasterPlanSublist>()
                         .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<LawsStandardMasterPlanVO> lawsStandardMasterPlanVOList = queryByList(lawsStandardMasterPlanVO);
         if (CollectionUtils.isNotEmpty(lawsStandardMasterPlanVOList)){
+            // 更新标准主计划数据
             List<String> idList = lawsStandardMasterPlanVOList.stream()
                     .map(LawsStandardMasterPlanVO::getId).collect(Collectors.toList());
             lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper<LawsStandardMasterPlanSublist>()
                     .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<LawsStandardMasterPlanSublist>()
+                // 更新标准主计划数据
-                        .eq(LawsStandardMasterPlanSublist::getType,
+                List<LawsStandardMasterPlan> standardMasterPlanList = list(new LambdaUpdateWrapper<LawsStandardMasterPlan>()
-                                LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE)
+                        .eq(LawsStandardMasterPlan::getApplicableMarket, applicableMarkets));
-                        .isNull(LawsStandardMasterPlanSublist::getAssociationId)
+                if (CollectionUtils.isNotEmpty(standardMasterPlanList)){
-                        .set(LawsStandardMasterPlanSublist::getAssociationId, lawsMarketStandard.getId()));
+                    List<String> idList = standardMasterPlanList.stream()
+                            .map(LawsStandardMasterPlan::getId).collect(Collectors.toList());
+                    lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper<LawsStandardMasterPlanSublist>()
+                            .in(LawsStandardMasterPlanSublist::getMasterPlanId, idList)
+                            .eq(LawsStandardMasterPlanSublist::getType,
+                                    LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE)
+                            .isNull(LawsStandardMasterPlanSublist::getAssociationId)
+                            .set(LawsStandardMasterPlanSublist::getAssociationId, lawsMarketStandard.getId()));
+                }
             }
         }