Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!306

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

@@ -13,6 +13,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
 import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl;
+import com.adc.da.slrs.sarUser.entity.UpDTO;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.UUIDUtils;
@@ -348,11 +349,22 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                     }
                 }
             }
-/////asdfghjkl
-
-
             userIPage.setRecords(list);
         }
+        List<String> names = new ArrayList<>();
+        userIPage.getRecords().forEach(sarLawsDetailedList -> {
+            names.add(sarLawsDetailedList.getUpdatePeople());
+        });
+        List<UpDTO> upDTOS = iTsUserService.selectNameById(names, "0");
+        Map<String, String> stringMap = new HashMap<>();
+        upDTOS.forEach(upDTO -> {
+            stringMap.put(upDTO.getId(), upDTO.getValue());
+        });
+        userIPage.getRecords().forEach(sarLawsDetailedList -> {
+            if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) {
+                sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople()));
+            }
+        });
         System.out.println("总条数" + userIPage.getTotal());
         System.out.println("总页数" + userIPage.getPages());
         return userIPage;
@@ -391,8 +403,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 //判断数据库里的数据的车型类别字段是否为空
                 if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()) {
                     System.out.println("数据库里第" + (i + 1) + "条的车型类别字段长度为空，不重复，目前可以添加");
-                }
-                else if (Objects.equals(detailedUpDto.getCarType(), list.getCarType())){
+                } else if (Objects.equals(detailedUpDto.getCarType(), list.getCarType())) {
                     System.out.println("页面的数据和数据库里存的当前数据相同，说明没有做更改，允许提交");
                 }
                 //相等就不许添加
@@ -408,8 +419,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 //就先判断数据库里的数据的国家/地区字段是否为空
                 if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCountryArea()) {
                     System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加");
-                }
-                else if (Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea())){
+                } else if (Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea())) {
                     System.out.println("页面的数据和数据库里存的当前数据相同，说明没有做更改，允许提交");
                 }
                 //再判断页面字段长度是否与数据库里的长度一样，如果长度不一样，允许新增
@@ -503,7 +513,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         }
 
 
-
     }
 
     private void updateListMethod(DetailedUpDto detailedUpDto) {
@@ -634,7 +643,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         String[] split = countryArea.split(","); //拆分标准中的国家地区
 
 
-
         //遍历清单 对比国家地区
         for (SarLawsDetailedList lawsDetailed : sarLawsDetailedLists) {
             if (lawsDetailed.getCountryArea() == null) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -154,25 +154,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         page.setPage(findStandDto.getPage());
         page.setPageSize(findStandDto.getSize());
         page.setUserId(null);
-        List<SarStandardsInfo> pageInfo = null;
-//        try {
-//            pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
         List<String> standId = new ArrayList<>();
-//        for (SarStandardsInfo standardsInfo : pageInfo){
-////            if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){
-//                standId.add(standardsInfo.getId());
-////            }
-//        }
+        List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
 
-        List<LawsDto> list=new ArrayList<>();
-//        if (standId==null || standId.size()==0){
-//            list = null;
-//        }else {
-            list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
-//        }
         IPage<LawsDto> page1=new Page<>();
         page1.setRecords(list);
         page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size());

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -189,7 +189,7 @@
         left join sar_standards_info a on ssi.stand_id = a.id
         LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
         <where>
-            1=1
+            1=1 and a.ID is not null
             <if test="standName != null">
                 and
                 (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
@@ -217,7 +217,7 @@
         left join sar_standards_info a on ssi.stand_id = a.id
         LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
         <where>
-            1=1
+            1=1 and a.ID is not null
             <if test="standName != null">
                 and
                 (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
@@ -251,7 +251,7 @@
         left join sar_standards_info a on ssi.stand_id = a.id
         LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
         <where>
-            1=1
+            1=1 and a.ID is not null
             <if test="standName != null">
                 and
                 (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
@@ -280,7 +280,7 @@
         left join sar_standards_info a on ssi.stand_id = a.id
         LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
         <where>
-            1=1
+            1=1 and a.ID is not null
             <if test="standName != null">
                 and
                 (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')