fix(88021): 标准主计划-市场法规清单更新-只对使用市场进行了校验

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

@@ -24,6 +24,8 @@ import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibra
 import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService;
 import com.jero.modules.laws.marketStandard.constans.MarketStandardConstants;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
+import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
+import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService;
 import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
@@ -81,6 +83,7 @@ public class LawsStandardMasterPlanServiceImpl
     private final ISysUserService sysUserService;
     private final IOSSFileService ossFileService;
     private final ILawsMarketStandardService lawsMarketStandardService;
+    private final ILawsMarketStandardDetailService lawsMarketStandardDetailService;
     private final ILawsConformityAssessmentLibraryService lawsConformityAssessmentLibraryService;
     private final ILawsEvaluationNotMetLibraryService lawsEvaluationNotMetLibraryService;
     private final ProcessAllService processAllService;
@@ -459,18 +462,28 @@ public class LawsStandardMasterPlanServiceImpl
             // 根据适用市场查询获取最早发布的市场法规清单
             LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper);
             if (!Objects.isNull(lawsMarketStandard) && lawsMarketStandard.getId().equals(id)){
-                // 更新标准主计划数据
+                // 查询清单详情里的所有标准
-                List<LawsStandardMasterPlan> standardMasterPlanList = list(new LambdaUpdateWrapper<LawsStandardMasterPlan>()
+                List<LawsMarketStandardDetail> lawsMarketStandardDetailList = lawsMarketStandardDetailService.list(
-                        .eq(LawsStandardMasterPlan::getApplicableMarket, applicableMarkets));
+                        new LambdaQueryWrapper<LawsMarketStandardDetail>()
-                if (CollectionUtils.isNotEmpty(standardMasterPlanList)){
+                                .eq(LawsMarketStandardDetail::getManifestId, lawsMarketStandard.getId())
-                    List<String> idList = standardMasterPlanList.stream()
+                                .orderByAsc(LawsMarketStandardDetail::getCreateTime));
-                            .map(LawsStandardMasterPlan::getId).collect(Collectors.toList());
+                for (LawsMarketStandardDetail lawsMarketStandardDetail : lawsMarketStandardDetailList) {
-                    lawsStandardMasterPlanSublistService.update(new LambdaUpdateWrapper<LawsStandardMasterPlanSublist>()
+                    // 更新标准主计划数据
-                            .in(LawsStandardMasterPlanSublist::getMasterPlanId, idList)
+                    List<LawsStandardMasterPlan> standardMasterPlanList = list(
-                            .eq(LawsStandardMasterPlanSublist::getType,
+                            new LambdaUpdateWrapper<LawsStandardMasterPlan>()
-                                    LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE)
+                            .eq(LawsStandardMasterPlan::getApplicableMarket, applicableMarkets)
-                            .isNull(LawsStandardMasterPlanSublist::getAssociationId)
+                            .eq(LawsStandardMasterPlan::getStandardId, lawsMarketStandardDetail.getStandardId()));
-                            .set(LawsStandardMasterPlanSublist::getAssociationId, lawsMarketStandard.getId()));
+                    if (CollectionUtils.isNotEmpty(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.MARKET_REGULATION_LIST_UPDATE)
+                                .isNull(LawsStandardMasterPlanSublist::getAssociationId)
+                                .set(LawsStandardMasterPlanSublist::getAssociationId, lawsMarketStandard.getId()));
+                    }
                 }
             }
         }
@@ -549,10 +562,18 @@ public class LawsStandardMasterPlanServiceImpl
         // 根据适用市场查询获取最早发布的市场法规清单
         LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper);
         if (!Objects.isNull(lawsMarketStandard)){
-            // 查询第一个发布版本
+            // 查询清单详情里是否包含当前标准
-            masterPlanSublist2.setAssociationId(lawsMarketStandard.getId());
+            int count = lawsMarketStandardDetailService.count(
-            masterPlanSublist2.setResponsiblePerson(lawsMarketStandard.getAuthor());
+                    new LambdaQueryWrapper<LawsMarketStandardDetail>()
-            masterPlanSublist2.setActualCompletionDate(lawsMarketStandard.getReleaseDate());
+                            .eq(LawsMarketStandardDetail::getManifestId, lawsMarketStandard.getId())
+                            .eq(LawsMarketStandardDetail::getStandardId, standardId)
+                            .orderByAsc(LawsMarketStandardDetail::getCreateTime)
+                            .last("limit 1"));
+            if (count > 0){
+                masterPlanSublist2.setAssociationId(lawsMarketStandard.getId());
+                masterPlanSublist2.setResponsiblePerson(lawsMarketStandard.getAuthor());
+                masterPlanSublist2.setActualCompletionDate(lawsMarketStandard.getReleaseDate());
+            }
         }
         list.add(masterPlanSublist2);