Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -1,5 +1,7 @@
 package com.kms.build.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.domain.dto.AssertStatisticsDto;
 import com.kms.build.domain.dto.GzjbDto;
@@ -44,22 +46,21 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                                @Param("pageNum") int pageNum,
                                                @Param("pageSize") int pageSize);
 
-    List<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
+    IPage<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
                                                @Param("projectName") String projectName,
                                                @Param("projectType") String projectType,
                                                @Param("adcd") String adcd,
                                                @Param("orderBy") String orderBy,
-                                               @Param("pageNum") int pageNum,
-                                               @Param("pageSize") int pageSize);
+                                               Page page);
 
     List<GzjbDto> list(@Param("userId") String uerId,
-                       @Param("userType") String userType,
-                       @Param("startDate") Date startDate,
-                       @Param("endDate") Date endDate,
-                       @Param("proNo") String proNo,
-                       @Param("proCode") String proCode,
-                       @Param("adcd") String adcd,
-                       @Param("orderBy") String orderBy,
-                       @Param("pageNum") int pageNum,
-                       @Param("pageSize") int pageSize);
+                        @Param("userType") String userType,
+                        @Param("startDate") Date startDate,
+                        @Param("endDate") Date endDate,
+                        @Param("proNo") String proNo,
+                        @Param("proCode") String proCode,
+                        @Param("adcd") String adcd,
+                        @Param("orderBy") String orderBy,
+                        @Param("pageNum") int pageNum,
+                        @Param("pageSize") int pageSize);
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -201,19 +201,16 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         Map<String, Object> params = sp.getParams();
 
         assert sysUser != null;
-        List<AssertStatisticsDto> list = null;
+        IPage<AssertStatisticsDto> list = null;
         String deptId = sysUser.getDeptId();
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
 
         list=bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(),data.getProjectName(),data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
-                "create_time",sp.getPageNum(),sp.getPageSize());
+                "create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
 
-        Page<AssertStatisticsDto> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
 
-        return page;
+        return list;
     }
 }

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -240,7 +240,6 @@
 
 
     <select id="list" resultMap="Gzjb">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         SELECT
         info.ENGINEERING_GRADE,
         info.PRO_NO,
@@ -351,7 +350,7 @@
                     and adcd like concat(#{adcd},'%')
                 </if>
             </where>
-            order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by pi.${orderBy} desc
         </if>
         <if test="userType==00">
             <where>
@@ -361,7 +360,7 @@
             </where>
 
         </if>
-        GROUP BY info.PRO_CODE LIMIT #{pageNum},#{pageSize};
+        GROUP BY info.PRO_CODE
 
     </select>
 </mapper>