Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java

@@ -226,9 +226,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             StringBuilder itemBuilder = new StringBuilder();
 
             mapItems.forEach((s, s2) -> {
-                itemBuilder.append(s+" ").append("(模拟数据)-本标准规定了机动车的整车及主要总成、安全防护装置等有关运行安全的基本技术要求，以及消防车、救护车、" +
+                itemBuilder.append(s+" ").append(s2).append("</br>");
-                        "工程救险车和警车及残疾人专用汽车的附加要求。本标准适用于在我国道路上行驶的所有机动车，但不适用于有轨电车及并非为在道路上行驶和使用而设计和制造、" +
-                        "主要用于封闭道路和场所作业施工的轮式专用机械车。 注：有轨电车是指以电机驱动，架线供电，有轨道承载的道路车辆。").append("</br>");
             });
             StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--");
             fullTextSearchEO.put("textItems",textItemContent.toString());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -66,7 +66,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                     .sortKey(addDetailedDto.getSortKey())
                     .detailedListName(addDetailedDto.getDetailedListName())
                     .detailedListState("0")
-                    .detailedListVision("v0")
                     .applicationScope(addDetailedDto.getApplicationScope())
                     .updateTime(new Date())
                     .updatePeople(addDetailedDto.getUpdatePeople())

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -85,9 +85,9 @@ public class SarStandardComplianceAssessResultController {
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
                 }
-                if (eo.getType() != null && !eo.getType().trim().equals("")) {
+//                if (eo.getType() != null && !eo.getType().trim().equals("")) {
-                    queryWrapper.like("type",eo.getType().trim());
+//                    queryWrapper.like("type",eo.getType().trim());
-                }
+//                }
                 IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
 
                 while(page.getRecords().remove(null));
@@ -103,10 +103,9 @@ public class SarStandardComplianceAssessResultController {
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
                 }
-                if (eo.getType() != null && !eo.getType().trim().equals("")) {
+//                if (eo.getType() != null && !eo.getType().trim().equals("")) {
-                    queryWrapper.like("type",eo.getType().trim());
+//                    queryWrapper.like("type",eo.getType().trim());
-                }
+//                }
-
                 IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
                 while(page.getRecords().remove(null));
                 return Result.success(page);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -602,7 +602,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
                 if(!sarItemVOS.isEmpty()){
                     Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
-                            .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+                            .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions));
                     sarStandardsInfoEO.setMapItems(collectMap);
                 }
                 createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
@@ -1182,7 +1182,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
             if(!sarItemVOS.isEmpty()){
                 Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
-                        .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+                        .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions));
                 sarStandardsInfoEO.setMapItems(collectMap);
             }
             createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");