优化

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairApplicationFormMapper.java

@@ -23,6 +23,7 @@ import java.util.Map;
  */
 @Component
 public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationForm> {
+    List<RepairApplicationFormVO> getRepairList(RepairApplicationFormDTO dto);
     List<RepairCount> getrepairCount2(RepairApplicationFormDTO dto);
     List<NoticeVO> getLoginNotice(RepairApplicationFormDTO dto);
     List<FiftyFailSbReportVO> getFiftyFailSbReport(RepairApplicationFormDTO dto);

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -618,4 +618,17 @@
         </if>
         group by form.status
     </select>
+
+    <select id="getRepairList" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
+            resultType="com.platform.dao.vo.repair.RepairApplicationFormVO">
+        select form.*   from t_repair_application_form form
+        where form.status =#{status}
+        <if test="allUserId!=null and allUserId!=''">
+            and (form.user_id = #{allUserId} or
+            form.dispatch_user_id = #{allUserId} or
+            form.verify_repair_user_id = #{allUserId} or
+            form.repair_user_id = #{allUserId}
+            )
+        </if>
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -229,12 +229,19 @@ public class RepairApplicationFormController {
      * @param repairApplicationFormDTO 保修单DTO
      * @return R
      */
+    @GetMapping("/page2")
+    public R query2(RepairApplicationFormDTO repairApplicationFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        MyVOPage<RepairApplicationFormVO> pageInfos = repairApplicationFormService.selectPageInfoVOByModelThree(repairApplicationFormDTO, pageNum, pageSize);
+        return new R<>(pageInfos);
+    }
+
     @GetMapping("/page")
     public R query(RepairApplicationFormDTO repairApplicationFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-        MyVOPage<RepairApplicationFormVO> pageInfos = repairApplicationFormService.selectPageInfoVOByModelThree(repairApplicationFormDTO, pageNum, pageSize);
+        MyVOPage<RepairApplicationFormVO> pageInfos = repairApplicationFormService.selectPageInfoVOByModelThree2(repairApplicationFormDTO, pageNum, pageSize);
         return new R<>(pageInfos);
     }
 
+
     /**
      * 获取分页-主管派单型
      * @param pageNum                  当前页码

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -176,6 +176,8 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
      */
     MyVOPage<RepairApplicationFormVO> selectPageInfoVOByModelThree(RepairApplicationFormDTO record, int pageNum, int pageSize);
 
+    MyVOPage<RepairApplicationFormVO> selectPageInfoVOByModelThree2(RepairApplicationFormDTO record, int pageNum, int pageSize);
+
     MyVOPage<RepairApplicationFormVO> selectPoolPageInfoVO(RepairApplicationFormDTO record, int pageNum, int pageSize);
 
     void editErrorInfo(RepairApplicationFormDTO record);

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -633,7 +633,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             }else if (count.getStatus()==RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
                 //待结单
                 noticeNumberVO2.setWaitForFinishNum(count.getNum());
-            }else if (count.getStatus()==RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+            }else if (count.getStatus()==RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){
                 //报修待审
                 noticeNumberVO2.setWaitForCheckNum(count.getNum());
             }
@@ -867,6 +867,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         return new MyVOPage<>(mapper.selectPageList(record));
     }
 
+    @Override
+    public MyVOPage<RepairApplicationFormVO> selectPageInfoVOByModelThree2(RepairApplicationFormDTO record, int pageNum, int pageSize) {
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        if (userInfo.getSuperAdmin()!=1){
+            record.setAllUserId(userInfo.getUserId());
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        List<RepairApplicationFormVO> repairApplicationFormVOS = mapper.getRepairList(record);
+        return new MyVOPage<>(repairApplicationFormVOS);
+    }
+
     @Override
     public MyVOPage<RepairApplicationFormVO> selectPoolPageInfoVO(RepairApplicationFormDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);