fix(标准主计划): 数据回显完善

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java

@@ -202,9 +202,10 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
         QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()),
                 "d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
-        if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())) {
+        queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())
-            queryWrapper.in("d.applicable_market", Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(",")));
+                ,"lms.country", lawsConformityAssessmentLibrary.getApplicableMarket());
-        }
+        queryWrapper.orderByAsc("cs.valuation_time");
+        queryWrapper.last("limit 1");
         List<LawsConformityAssessmentLibrary> result = lawsConformityAssessmentLibraryMapper.queryByPage(queryWrapper);
         if (CollectionUtils.isNotEmpty(result)){
             return result.get(0);

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

@@ -217,7 +217,8 @@ public class LawsStandardMasterPlanServiceImpl
                                 .map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList());
                         List<ProcessAll> processAllList = processAllService.list(new LambdaQueryWrapper<ProcessAll>()
                                 .in(ProcessAll::getProcessInstanceId, processInstanceIdList)
-                                .orderByAsc(ProcessAll::getEndTime));
+                                .orderByAsc(ProcessAll::getEndTime)
+                                .last("limit 1"));
                         if (CollectionUtils.isNotEmpty(processAllList)){
                             ProcessAll processAll = processAllList.get(0);
                             lawsStandardMasterPlanSublist.setActualCompletionDate(processAll.getEndTime());
@@ -267,10 +268,11 @@ public class LawsStandardMasterPlanServiceImpl
                     break;
                 // 车型整改
                 case LawsStandardMasterPlanCommon.VEHICLE_MODEL_RECTIFICATION:
+                    // 根据 标准编号+整改状态为已关闭 最迟关闭（修改时间） 查询 不符合项库
                     List<LawsEvaluationNotMetLibrary> list = lawsEvaluationNotMetLibraryService.list(
                             new LambdaQueryWrapper<LawsEvaluationNotMetLibrary>()
-                                    .eq(LawsEvaluationNotMetLibrary::getStandardId,
+                                    .eq(LawsEvaluationNotMetLibrary::getStandardNumber,
-                                            lawsStandardMasterPlan.getStandardId())
+                                            lawsDomesticStandard.getStandardNumber())
                                     .eq(LawsEvaluationNotMetLibrary::getRectifyStatus, "2")
                                     .orderByDesc(LawsEvaluationNotMetLibrary::getUpdateTime));
                     if (CollectionUtils.isNotEmpty(list)){
@@ -405,10 +407,20 @@ public class LawsStandardMasterPlanServiceImpl
     public void syncRegulatoryComplianceInvestigation(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary) {
         LawsStandardMasterPlanVO lawsStandardMasterPlanVO = new LawsStandardMasterPlanVO();
         String standardNumber = lawsConformityAssessmentLibrary.getStandardNumber();
-        String applicableMarket = lawsConformityAssessmentLibrary.getApplicableMarket();
+        String applicableMarkets = lawsConformityAssessmentLibrary.getApplicableMarket();
-        if (StringUtils.isBlank(standardNumber) || StringUtils.isBlank(applicableMarket)){
+        if (StringUtils.isBlank(standardNumber) || StringUtils.isBlank(applicableMarkets)){
             return;
         }
+        // 适用市场可能会有多个
+        for (String applicableMarket : applicableMarkets.split(",")) {
+            // 判断是不是最早的
+            lawsConformityAssessmentLibrary.setStandardNumber(standardNumber);
+            lawsConformityAssessmentLibrary.setApplicableMarket(applicableMarket);
+            LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary1 =
+                    lawsConformityAssessmentLibraryService.queryOne(lawsConformityAssessmentLibrary);
+            if (!Objects.isNull(lawsConformityAssessmentLibrary1) &&
+                    lawsConformityAssessmentLibrary1.getId().equals(lawsConformityAssessmentLibrary.getId())){
+                // 查询标准主计划
                 lawsStandardMasterPlanVO.setStandardNumber(standardNumber);
                 lawsStandardMasterPlanVO.setApplicableMarket(applicableMarket);
                 List<LawsStandardMasterPlanVO> lawsStandardMasterPlanVOList = queryByList(lawsStandardMasterPlanVO);
@@ -424,6 +436,8 @@ public class LawsStandardMasterPlanServiceImpl
                             .set(LawsStandardMasterPlanSublist::getAssociationId, lawsConformityAssessmentLibrary.getId()));
                 }
             }
+        }
+    }
 
     @Override
     public void syncMarketRegulationListUpdate(String id, String applicableMarkets) {
@@ -470,7 +484,8 @@ public class LawsStandardMasterPlanServiceImpl
                     .map(ProcessNewStandardImport::getProcessInstanceId).collect(Collectors.toList());
             List<ProcessAll> processAllList = processAllService.list(new LambdaQueryWrapper<ProcessAll>()
                     .in(ProcessAll::getProcessInstanceId, processInstanceIdList)
-                    .orderByAsc(ProcessAll::getEndTime));
+                    .orderByAsc(ProcessAll::getEndTime)
+                    .last("limit 1"));
             if (CollectionUtils.isNotEmpty(processAllList)){
                 ProcessAll processAll = processAllList.get(0);
                 masterPlanSublist.setActualCompletionDate(processAll.getEndTime());
@@ -527,7 +542,7 @@ public class LawsStandardMasterPlanServiceImpl
         // 法规符合性排查
         LawsStandardMasterPlanSublist masterPlanSublist3 = new LawsStandardMasterPlanSublist();
         masterPlanSublist3.setType(LawsStandardMasterPlanCommon.REGULATORY_COMPLIANCE_INVESTIGATION);
-        // 根据 标准名称+适用市场 查询 法规符合性排查
+        // 根据 标准编号+适用市场 最早评估日期 查询 法规符合性排查
         LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary =
                 new LawsConformityAssessmentLibrary();
         lawsConformityAssessmentLibrary.setStandardNumber(lawsDomesticStandard.getStandardNumber());
@@ -543,9 +558,10 @@ public class LawsStandardMasterPlanServiceImpl
         // 车型整改
         LawsStandardMasterPlanSublist masterPlanSublist4 = new LawsStandardMasterPlanSublist();
         masterPlanSublist4.setType(LawsStandardMasterPlanCommon.VEHICLE_MODEL_RECTIFICATION);
+        // 根据 标准编号+整改状态为已关闭 最迟关闭（修改时间） 查询 不符合项库
         List<LawsEvaluationNotMetLibrary> lawsEvaluationNotMetLibraryList = lawsEvaluationNotMetLibraryService.list(
                 new LambdaQueryWrapper<LawsEvaluationNotMetLibrary>()
-                        .eq(LawsEvaluationNotMetLibrary::getStandardId, standardId)
+                        .eq(LawsEvaluationNotMetLibrary::getStandardNumber, lawsDomesticStandard.getStandardNumber())
                         .eq(LawsEvaluationNotMetLibrary::getRectifyStatus, "2")
                         .orderByDesc(LawsEvaluationNotMetLibrary::getUpdateTime));
         if (CollectionUtils.isNotEmpty(lawsEvaluationNotMetLibraryList)){