优化

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

@@ -316,14 +316,23 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     public AbstractPageResultBean<CheckJobVO> selectPageListMobile(CheckJobDTO model, int pageNum, int pageSize) {
 
         // 查询设备的使用人员账户，通过该账户查询查询任务，状态不限制
-        SbInfo sbInfo = sbInfoService.getModelById(model.getSbId());
-        if(sbInfo != null){
-            if(sbInfo.getSaveUser() != null){
-                model.setCheckUserId(sbInfo.getSaveUser());
+//        SbInfo sbInfo = sbInfoService.getModelById(model.getSbId());
+//        if(sbInfo != null){
+//            if(sbInfo.getSaveUser() != null){
+//                model.setCheckUserId(sbInfo.getSaveUser());
+//            }
+//        }
+        // model.setSearchStartTime(DateUtils.getTodayStartTime());
+        if (model.getSearchType()!=null){
+            if (model.getSearchType()==1){
+                model.setSearchEndTime( DateUtils.getTodayEndTime());
+            }else if (model.getSearchType()==2){
+                model.setSearchEndTime( DateUtils.getSundayOfThisWeek());
+            }else if (model.getSearchType()==3){
+                model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
             }
         }
-        // model.setSearchStartTime(DateUtils.getTodayStartTime());
-        model.setSearchEndTime(DateUtils.getTodayEndTime());
+
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(model));
     }
@@ -1339,13 +1348,13 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             SbInfo sbInfo = sbInfoService.getModelById(sbId);
             weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
             // 查找人员
-            if(searchType != null) {
-                if (searchType == 1) {
-                    weekendCriteria.andEqualTo(CheckJob::getCheckUserId, sbInfo.getSaveUser());
-                } else if (searchType == 2) {
-                    weekendCriteria.andEqualTo(CheckJob::getCheckUserId, sbInfo.getRepairUser());
-                }
-            }
+//            if(searchType != null) {
+//                if (searchType == 1) {
+//                    weekendCriteria.andEqualTo(CheckJob::getCheckUserId, sbInfo.getSaveUser());
+//                } else if (searchType == 2) {
+//                    weekendCriteria.andEqualTo(CheckJob::getCheckUserId, sbInfo.getRepairUser());
+//                }
+//            }
         }
         if(StringUtils.isNotBlank(userId)){
             weekendCriteria.andEqualTo(CheckJob::getCheckUserId, userId);
@@ -1378,8 +1387,16 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         WeekendCriteria<CheckJob, Object> weekendCriteria = weekend.weekendCriteria();
         if(StringUtils.isNotBlank(sbId)){
             weekendCriteria.andEqualTo(CheckJob::getSbId, sbId);
-//            SbInfo sbInfo = sbInfoService.getModelById(sbId);
-////            weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
+            SbInfo sbInfo = sbInfoService.getModelById(sbId);
+            if (searchType!=null){
+                if (searchType==1){
+                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
+                }else if (searchType==2){
+                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getSundayOfThisWeek());
+                }else if (searchType==3){
+                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getLastDayOfThisMonth());
+                }
+            }
 //            // 查找人员
 //            if(searchType != null) {
 //                if (searchType == 1) {
@@ -1391,20 +1408,20 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         }
 //        if(StringUtils.isNotBlank(userId)){
 //            weekendCriteria.andEqualTo(CheckJob::getCheckUserId, userId);
-        if(searchType != null) {
-            // 查询当日的任务数
-            if (searchType == 1) {
-//                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
-//                    weekendCriteria.andBetween(CheckJob::getStartTime,DateUtils.getTodayStartTime(),DateUtils.getTodayEndTime());
-                weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
-            } else if (searchType == 2) {
-                // 查询当周的任务数
-                weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getSundayOfThisWeek());
-            } else if (searchType == 3) {
-                // 查询当月的任务数
-                weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getLastDayOfThisMonth());
-            }
-        }
+//        if(searchType != null) {
+//            // 查询当日的任务数
+//            if (searchType == 1) {
+////                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
+////                    weekendCriteria.andBetween(CheckJob::getStartTime,DateUtils.getTodayStartTime(),DateUtils.getTodayEndTime());
+//                weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
+//            } else if (searchType == 2) {
+//                // 查询当周的任务数
+//                weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getSundayOfThisWeek());
+//            } else if (searchType == 3) {
+//                // 查询当月的任务数
+//                weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getLastDayOfThisMonth());
+//            }
+//        }
 //        }
         weekendCriteria.andEqualTo(CheckJob::getType, type);