优化

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -259,24 +259,47 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
      */
     @Override
     public AbstractPageResultBean<CheckJobVO> selectPageList(CheckJobDTO model, int pageNum, int pageSize) {
-
+        List<CheckJobVO> checkJobVOS = new ArrayList<>();
         if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setCheckUserId(userInfo.getUserId());
         }
 
         if (model.getSearchType() != null && 1 == model.getSearchType()) {
+            checkJobVOS = packageCheckJobDTO(model,checkJobVOS);
             model.setSearchStartTime(DateUtils.getTodayStartTime());
             model.setSearchEndTime(DateUtils.getTodayEndTime());
         } else if (model.getSearchType() != null && 2 == model.getSearchType()) {
+            checkJobVOS = packageCheckJobDTO(model,checkJobVOS);
             model.setSearchStartTime(DateUtils.getMondayOfThisWeek());
             model.setSearchEndTime(DateUtils.getSundayOfThisWeek());
         } else if (model.getSearchType() != null && 3 == model.getSearchType()) {
+            checkJobVOS = packageCheckJobDTO(model,checkJobVOS);
             model.setSearchStartTime(DateUtils.getFirstDayOfThisMonth());
             model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
         }
         PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(model));
+        List<CheckJobVO> checkJobVOS1 = mapper.selectList(model);
+        if (checkJobVOS.size()>0){
+            checkJobVOS1.addAll(checkJobVOS);
+        }
+        return new MyPage(checkJobVOS1);
+    }
+    private List<CheckJobVO> packageCheckJobDTO(CheckJobDTO model,List<CheckJobVO> checkJobVOS){
+        model.setReceiveOvertime(true);
+        List<Integer> statusList = new ArrayList<>();
+        if (model.getStatus()==null) {
+            statusList.add(1);
+            statusList.add(2);
+            model.setStatusList(statusList);
+            checkJobVOS = mapper.selectList(model);
+        }
+        if (model.getStatus()!=null&&model.getStatus()!=3) {
+            checkJobVOS = mapper.selectList(model);
+        }
+        model.setReceiveOvertime(null);
+        model.setStatusList(null);
+        return checkJobVOS;
     }
 
     /**