补充分页

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -23,11 +23,11 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
     /**
      * 查询全部 分页
      *
-     * @param page
+     * @param current 当前页
      * @return
      */
    // IPage<FailureDetails> selectAllPage(Page page);
-    IPage<FailureDetails> selectAllPage(Page<FailureDetails> page, Long currentStatus,
+    List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus,
                                         String startTime,String endTime, Integer submissionPid);
     /*IPage<FailureDetails> selectAllPage(int current,int size, Long currentStatus,
                                         String startTime,String endTime, Integer submissionPid);*/
@@ -38,28 +38,25 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
      *
      * @return
      */
-    IPage<FailureDetails> selectISubPage(Page page, Long currentStatus,
+    List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus,
                                          String startTime,String endTime, Integer submissionPid);
   //  IPage<FailureDetails> selectISubPage(int current,int size, String submissionPid);
 
     /**
      * 查询待处理 分页
      *
-     * @param page
+     * @param
      * @return
      */
-    IPage<FailureDetails> selectInProcessing(Page page,Long currentStatus,
+    List<FailureDetails> selectInProcessing(Long current,Long size,Long currentStatus,
                                              String startTime,String endTime, Integer submissionPid);
-   // IPage<FailureDetails> selectInProcessing(int current,int size);
 
-
-    IPage<FailureDetails> selectStatusWaitTj(Page page,Long currentStatus,
+    List<FailureDetails> selectStatusWaitTj(Long current,Long size,Long currentStatus,
                                              String startTime,String endTime, Integer submissionPid);
-   // IPage<FailureDetails> selectStatusWaitTj(int current,int size);
 
-    List<FailureDetails> selectStatusWaitWx(Long currentStatus,
+    List<FailureDetails> selectStatusWaitWx(Long current,Long size,Long currentStatus,
                                              String startTime,String endTime, Integer submissionPid);
-   // IPage<FailureDetails> selectStatusWaitWx(int current,int size);
+
 
 
     List<StatusDto> selectStatusCount(Long currentStatus,String startTime,String endTime, Integer submissionPid);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

@@ -28,40 +28,10 @@
                 and submission_pid = #{submissionPid}
             </if>
         </where>
-        order by submission_time DESC
+        order by submission_time DESC limit #{current},#{size}
+
     </select>
 
-    <!--  <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
-          SELECT
-          sequence_nbr,
-          current_status,
-          failure_equipment_id,
-          failure_equipment,
-          fault_time,
-          fault_phenomenon,
-          submission_name,
-          submission_pid,
-          biz_code,
-          submission_time,
-          submission_branch,
-          submission_branch_id
-          FROM
-          cb_failure_details
-          <where>
-              <if test="currentStatus!= null ">
-                  and current_status = #{currentStatus}
-              </if>
-              <if test="startTime!= null and endTime != null">
-                  and submission_time between #{startTime} and #{endTime}
-              </if>
-              <if test="submissionPid!= null ">
-                  and submission_pid = #{submissionPid}
-              </if>
-          </where>
-          order by submission_time DESC
-           limit #{current},#{size}
-      </select>
-  -->
     <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT sequence_nbr,
         current_status,
@@ -88,26 +58,9 @@
             </if>
         </where>
         order by submission_time DESC
+        limit #{current},#{size}
     </select>
 
-    <!--  <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
-          SELECT sequence_nbr,
-                 current_status,
-                 failure_equipment_id,
-                 failure_equipment,
-                 fault_time,
-                 fault_phenomenon,
-                 submission_name,
-                 submission_pid,
-                 biz_code,
-                 submission_time,
-                 submission_branch,
-                 submission_branch_id
-          FROM cb_failure_details
-          WHERE submission_pid = #{submissionPid}
-          order by submission_time DESC
-              limit #{current},#{size}
-      </select>-->
 
     <select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT sequence_nbr,
@@ -138,28 +91,8 @@
             </if>
         </where>
         order by submission_time DESC
+        limit #{current},#{size}
     </select>
-    <!--
-        <select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
-            SELECT sequence_nbr,
-                   current_status,
-                   failure_equipment_id,
-                   failure_equipment,
-                   fault_time,
-                   fault_phenomenon,
-                   submission_name,
-                   submission_pid,
-                   biz_code,
-                   submission_time,
-                   submission_branch,
-                   submission_branch_id
-            FROM cb_failure_details
-            WHERE cb_failure_details.current_status = 3
-               OR cb_failure_details.current_status = 0
-            order by submission_time DESC
-                limit #{current},#{size}
-        </select>
-    -->
 
     <select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT sequence_nbr,
@@ -187,27 +120,9 @@
             </if>
         </where>
         order by submission_time DESC
+        limit #{current},#{size}
     </select>
 
-    <!--    <select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
-            SELECT sequence_nbr,
-                   current_status,
-                   failure_equipment_id,
-                   failure_equipment,
-                   fault_time,
-                   fault_phenomenon,
-                   submission_name,
-                   submission_pid,
-                   biz_code,
-                   submission_time,
-                   submission_branch,
-                   submission_branch_id
-            FROM cb_failure_details
-            WHERE cb_failure_details.current_status = 1
-            order by submission_time DESC
-                limit #{current},#{size}
-        </select>-->
-
     <select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT sequence_nbr,
         current_status,
@@ -237,27 +152,8 @@
             </if>
         </where>
         order by submission_time DESC
+        limit #{current},#{size}
     </select>
-    <!--
-        <select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
-            SELECT sequence_nbr,
-                   current_status,
-                   failure_equipment_id,
-                   failure_equipment,
-                   fault_time,
-                   fault_phenomenon,
-                   submission_name,
-                   submission_pid,
-                   biz_code,
-                   submission_time,
-                   submission_branch,
-                   submission_branch_id
-            FROM cb_failure_details
-            WHERE cb_failure_details.current_status = 6
-               OR cb_failure_details.current_status = 2
-            order by submission_time DESC
-                limit #{current},#{size}
-        </select>-->
 
     <select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
         SELECT cb_failure_details.current_status,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -113,18 +113,23 @@ public class FailureDetailsController extends BaseController {
      * 列表分页查询
      *
      * @param current 当前页
-     * @param current 每页大小
+     * @param size 每页大小
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<IPage<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, @RequestParam Integer type, Long currentStatus,
+    public ResponseModel<IPage<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") Long current, @RequestParam
+            (value = "size") Long size, @RequestParam Integer type, Long currentStatus,
                                                                 Integer userId,
                                                                 String startTime, String endTime) {
         Page<FailureDetails> page = new Page<FailureDetails>();
-        page.setCurrent(current);
+        if (current > 0){
+            page.setCurrent((current-1)*size);
+        }else {
+            page.setCurrent(current);
+        }
+
         page.setSize(size);
         ReginParams userInfo = getSelectedOrgInfo();
         IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
@@ -188,8 +193,8 @@ public class FailureDetailsController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "流程信息", notes = "流程信息")
-    @GetMapping(value = "/processHistory")
-    public ResponseModel<Object> selectHistoryt(@RequestParam Long sequenceNbr) {
+    @GetMapping(value = "/processHistory/{sequenceNbr}")
+    public ResponseModel<Object> selectHistoryt(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(failureDetailsServiceImpl.getCurrentProcessHistoryTask(sequenceNbr));
     }
 
@@ -206,7 +211,6 @@ public class FailureDetailsController extends BaseController {
     @GetMapping(value = "/getCurrentTask/{sequenceNbr}")
     public ResponseModel<Object> getCurrentTask(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(failureDetailsServiceImpl.getCurrentTask(sequenceNbr));
-
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -73,20 +73,26 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     public static Integer SELECY_ISUBMIT = 8;
     public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff"};
 
-
-
-    public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo,Long currentStatus,
-                                                            String startTime,String endTime,Integer userId,Integer type) {
-       //当传递类型参数为全部查询时
+    //分页查询
+    public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
+                                                            String startTime, String endTime, Integer userId, Integer type) {
+        //当传递类型参数为全部查询时
         if (type.equals(SELECY_ALL)) {
-            return this.baseMapper.selectAllPage(page,currentStatus,startTime ,endTime,userId);
+
+            List<FailureDetails> list = this.baseMapper.selectAllPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
+             IPage<FailureDetails> iPage = new Page<>();
+             iPage.setRecords(list);
+             return iPage;
         }
         //当传递类型参数为我提交时
         if (type.equals(SELECY_ISUBMIT)) {
-            return baseMapper.selectISubPage(page,currentStatus,startTime ,endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
+            List<FailureDetails> list = baseMapper.selectISubPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
+            IPage<FailureDetails> iPage = new Page<>();
+            iPage.setRecords(list);
+            return iPage;
         }
         //否则就查询待处理
-        return this.queryForWaitManage(page, userInfo,currentStatus,startTime ,endTime,userId);
+        return this.queryForWaitManage(page, userInfo, currentStatus, startTime, endTime, userId);
     }
 
 
@@ -103,23 +109,28 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     }*/
 
 
-
     /**
      * 待处理分页查询
      */
-    public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo,Long currentStatus,
-                                                    String startTime,String endTime,Integer userId) {
+    public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
+                                                    String startTime, String endTime, Integer userId) {
 
         if (userInfo.getRole().getRoleName().equals(roleName[0])) {
             IPage<FailureDetails> wxIpage = new Page<>();
-            List<FailureDetails> list = baseMapper.selectStatusWaitWx(currentStatus, startTime, endTime, userId);
+            List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(),currentStatus, startTime, endTime, userId);
             wxIpage.setRecords(list);
             return wxIpage;
         } else if (userInfo.getRole().getRoleName().equals(roleName[1])) {
-            currentStatus=FailureStatuEnum.WAITING_SUBMIT.getCode().longValue();
-            return baseMapper.selectStatusWaitTj(page,currentStatus,startTime ,endTime,userId);
+            currentStatus = FailureStatuEnum.WAITING_SUBMIT.getCode().longValue();
+            List<FailureDetails> list = baseMapper.selectStatusWaitTj(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
+            IPage<FailureDetails> iPage = new Page<>();
+            iPage.setRecords(list);
+            return iPage;
         }
-        return baseMapper.selectInProcessing(page,currentStatus,startTime ,endTime,userId);
+        List<FailureDetails> list = baseMapper.selectInProcessing(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
+        IPage<FailureDetails> iPage = new Page<>();
+        iPage.setRecords(list);
+        return iPage;
     }
 
 
@@ -161,18 +172,18 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     /**
      * 查询任务状态数量
      */
-    public List<CurrentStatusDto> queryStatusCount(ReginParams userInfo, Integer type,Long currentStatus,String startTime,String endTime, Integer userId) {
+    public List<CurrentStatusDto> queryStatusCount(ReginParams userInfo, Integer type, Long currentStatus, String startTime, String endTime, Integer userId) {
         List<StatusDto> statusDtos = null;
-        if (type.equals(SELECY_STATUS) &&userInfo.getRole().getRoleName().equals(roleName[0])) {
-            statusDtos = baseMapper.selectStatusWx(currentStatus,startTime,endTime, userId);
+        if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[0])) {
+            statusDtos = baseMapper.selectStatusWx(currentStatus, startTime, endTime, userId);
         } else if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[1])) {
-            statusDtos = baseMapper.selectStatusFq(currentStatus,startTime,endTime, userId);
+            statusDtos = baseMapper.selectStatusFq(currentStatus, startTime, endTime, userId);
         } else if (type.equals(SELECY_ISUBMIT)) {
-            statusDtos = baseMapper.selectStatusFqp(currentStatus,startTime,endTime,Integer.parseInt(userInfo.getUserModel().getUserId()));
-        } else if (type.equals(SELECY_ALL)){
-            statusDtos = baseMapper.selectStatusCount(currentStatus,startTime,endTime, userId);
-        }else {
-            statusDtos = baseMapper.selectStatusLeader(currentStatus,startTime,endTime, userId);
+            statusDtos = baseMapper.selectStatusFqp(currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
+        } else if (type.equals(SELECY_ALL)) {
+            statusDtos = baseMapper.selectStatusCount(currentStatus, startTime, endTime, userId);
+        } else {
+            statusDtos = baseMapper.selectStatusLeader(currentStatus, startTime, endTime, userId);
         }
         List<CurrentStatusDto> currentStatusDtoList = new ArrayList<>();
         statusDtos.forEach(e -> {