完善

platform-rest/src/main/java/com/platform/rest/controller/mobile/IgnoreController.java

@@ -115,7 +115,7 @@ public class IgnoreController {
     public R getSbTaskUser(@PathVariable("sbId") String sbId) {
         // 保养任务:根据类型查询，1：设备的、设备使用人的，未完成的，已过期的
         int lubricationTask = checkJobService.countTask(sbId, null, CheckStandardTypeEnum.POLLING.getValue(), 1);
-        int lubricationTask2 = checkJobService.countTask(sbId, null, CheckStandardTypeEnum.POLLING.getValue(), 1);
+        int lubricationTask2 = checkJobService.countTask(sbId, null, CheckStandardTypeEnum.POLLING.getValue(), 2);
 
         // 维修任务：所有的未完成的
         int repairTask = repairApplicationFormService.countTask(sbId, null,  1);
@@ -137,12 +137,12 @@ public class IgnoreController {
      * 获取移动端保养任务分页
      * 我的任务和设备详情里面的任务
      * 我的任务：
-     *  如果是现场人员的，则是当日的
-     *  如果是维修人员的，则是当月的
+     *  如果是现场人员的，则是当日的,和过期的
+     *  如果是维修人员的，则是当月的,和过期的
      *
      * 设备详情里面：
-     *  当日现场保养现场任务：则是当日的
-     *  当月保养任务：则是当月的
+     *  当日现场保养现场任务：则是当日的,和过期的
+     *  当月保养任务：则是当月的,和过期的
      *
      *  功能里面的保养管理，则是全部的，调用上面一个接口，不是这个接口
      *

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

@@ -84,13 +84,13 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             model.setCheckUserId(userInfo.getUserId());
         }
         if (model.getSearchType() != null && 1 == model.getSearchType()) {
-            model.setSearchStartTime(DateUtils.getTodayStartTime());
+            //model.setSearchStartTime(DateUtils.getTodayStartTime());
             model.setSearchEndTime(DateUtils.getTodayEndTime());
         } else if (model.getSearchType() != null && 2 == model.getSearchType()) {
-            model.setSearchStartTime(DateUtils.getMondayOfThisWeek());
+           // model.setSearchStartTime(DateUtils.getMondayOfThisWeek());
             model.setSearchEndTime(DateUtils.getSundayOfThisWeek());
         } else if (model.getSearchType() != null && 3 == model.getSearchType()) {
-            model.setSearchStartTime(DateUtils.getFirstDayOfThisMonth());
+            //model.setSearchStartTime(DateUtils.getFirstDayOfThisMonth());
             model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -117,7 +117,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                 model.setCheckUserId(sbInfo.getSaveUser());
             }
         }
-        model.setSearchStartTime(DateUtils.getTodayStartTime());
+        // model.setSearchStartTime(DateUtils.getTodayStartTime());
         model.setSearchEndTime(DateUtils.getTodayEndTime());
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(model));
@@ -866,7 +866,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         if(StringUtils.isNotBlank(sbId)){
             weekendCriteria.andEqualTo(CheckJob::getSbId, sbId);
             SbInfo sbInfo = sbInfoService.getModelById(sbId);
-            weekendCriteria.andBetween(CheckJob::getStartTime, DateUtils.getTodayStartTime(), DateUtils.getTodayEndTime());
+            weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
             // 查找人员
             if(searchType != null) {
                 if (searchType == 1) {
@@ -881,10 +881,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             if(searchType != null) {
                 // 查询当日的任务数
                 if (searchType == 1) {
-                    weekendCriteria.andBetween(CheckJob::getStartTime, DateUtils.getTodayStartTime(), DateUtils.getTodayEndTime());
+                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getTodayEndTime());
                 } else if (searchType == 2) {
                     // 查询当月的任务数
-                    weekendCriteria.andBetween(CheckJob::getStartTime, DateUtils.getFirstDayOfThisMonth(), DateUtils.getLastDayOfThisMonth());
+                    weekendCriteria.andLessThan(CheckJob::getStartTime, DateUtils.getLastDayOfThisMonth());
                 }
             }
         }