add：新增标准查询

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -41,8 +41,9 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         }
         List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName);
         for (LawsDto lawsDto:list){
-            if (StringUtils.isNoneBlank(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString())){
-                lawsDto.setTypeApplicable(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString());
+            if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){
+                lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
+                System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
             }
         }
         return list;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandItems.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
 import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
 import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
@@ -58,4 +59,11 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         return sarItemsTimes;
     }
 
+    @ApiOperation(value = "标准查询")
+    @PostMapping("/findStand")
+    public List<LawsDto> findStand(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "size",defaultValue = "10") int size){
+        List<LawsDto> sarItems = ServiceImpl.selectLawDto(page,size);
+        return sarItems;
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -59,4 +59,6 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
     StandsTimeDto selectStandTime(String standId);
 
     List<StandsTimeDto> selectStandTimeAll();
+
+    List<String> selectStandId(@Param("page")int page,@Param("size")int size);
 }

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandItems.service;
 
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
 import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
@@ -20,4 +21,5 @@ public interface ISarStandItemsService extends IService<SarStandItems> {
 
     List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType);
     List<SarItemsTime> findItemsTime(String type,String ids);
+    List<LawsDto> selectLawDto(int page,int size);
 }

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

@@ -1,6 +1,8 @@
 package com.adc.da.slrs.sarStandItems.service.impl;
 
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
 import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
@@ -34,7 +36,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
 
     @Autowired
     private SysInfoEOService sysInfoEOService;
-
+    @Autowired
+    private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
 
     public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
         List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
@@ -140,6 +143,19 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         return sarItemsTime;
     }
 
+    @Override
+    public List<LawsDto> selectLawDto(int page,int size) {
+        List<String> standId = dao.selectStandId(page-1,size);
+        List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(standId,null);
+        for (LawsDto lawsDto:list){
+            if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){
+                lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
+                System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
+            }
+        }
+        return list;
+    }
+
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
         return dao.selectAllItemsByIds(type,ids);
     }

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -663,6 +663,11 @@
         select STAND_ID,XCXSSRQ,ZCCSSRQ
         from sar_stand_attr_info
     </select>
+    <select id="selectStandId" resultType="java.lang.String">
+        SELECT STAND_ID
+        FROM sar_stand_attr_info
+        group by STAND_ID limit #{page},#{size}
+    </select>
 
 
 </mapper>