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

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

@@ -8,6 +8,7 @@ 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;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,8 +62,8 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
 
     @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);
+    public IPage<LawsDto> findStand(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size){
+        IPage<LawsDto> sarItems = ServiceImpl.selectLawDto(page,size);
         return sarItems;
     }
 

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

@@ -60,5 +60,7 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<StandsTimeDto> selectStandTimeAll();
 
-    List<String> selectStandId(@Param("page")int page,@Param("size")int size);
+    List<String> selectStandId(@Param("page")int page, @Param("size")int size);
+
+    int selectToken();
 }

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

@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -21,5 +22,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);
+    IPage<LawsDto> selectLawDto(int page, int size);
 }

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

@@ -12,6 +12,8 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
 import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,7 +146,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     }
 
     @Override
-    public List<LawsDto> selectLawDto(int page,int size) {
+    public IPage<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){
@@ -153,7 +155,10 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
                 System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
             }
         }
-        return list;
+        IPage<LawsDto> page1=new Page<>();
+        page1.setRecords(list);
+        page1.setTotal(dao.selectToken());
+        return page1;
     }
 
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){

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

@@ -663,11 +663,25 @@
         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 resultType="java.lang.String" id="selectStandId">
+        SELECT
+            a.STAND_ID
+        FROM
+            sar_stand_items a
+        LEFT JOIN sar_standards_info b
+        on a.STAND_ID=b.ID
+        WHERE b.VALID_FLAG = 0
+        GROUP BY
+            a.STAND_ID
+            limit #{page},#{size}
+    </select>
+    <select id="selectToken" resultType="java.lang.Integer">
+        SELECT
+            count(DISTINCT a.STAND_ID )
+        FROM
+            sar_stand_items a LEFT JOIN sar_standards_info b
+                                        on a.STAND_ID=b.ID
+        WHERE b.VALID_FLAG = 0
     </select>
 
-
 </mapper>