完善

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

@@ -109,18 +109,6 @@ public class IgnoreController {
         return new R<>();
     }
 
-    /**
-     * 新增记录
-     *
-     * @param repairApplicationFormDTO 保修单DTO
-     * @return R
-     */
-    @SysLog("新增保修单")
-    @PostMapping("/repair/add")
-    public R saveIgnore(@Validated({AddGroup.class}) @RequestBody RepairApplicationFormDTO repairApplicationFormDTO) {
-        return new R<>(repairApplicationFormService.saveModelByDTO(repairApplicationFormDTO));
-    }
-
     /**
      * 统计设备相关的任务
      * 保养任务
@@ -132,11 +120,28 @@ 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(), 2);
+        int lubricationTaskWeek = checkJobService.countTask(sbId, null, CheckStandardTypeEnum.POLLING.getValue(), 2);
+        int lubricationTaskMonth = checkJobService.countTask(sbId, null, CheckStandardTypeEnum.POLLING.getValue(), 3);
 
         // 维修任务：所有的未完成的
         int repairTask = repairApplicationFormService.countTask(sbId, null,  1);
-        return R.success(new GatherTaskVO().setLubricationTask(lubricationTask).setRepairTask(repairTask));
+        return R.success(new GatherTaskVO()
+                .setLubricationTask(lubricationTask)
+                .setLubricationTaskWeek(lubricationTaskWeek)
+                .setLubricationTaskMonth(lubricationTaskMonth)
+                .setRepairTask(repairTask));
+    }
+
+    /**
+     * 新增记录
+     *
+     * @param repairApplicationFormDTO 保修单DTO
+     * @return R
+     */
+    @SysLog("新增保修单")
+    @PostMapping("/repair/add")
+    public R saveIgnore(@Validated({AddGroup.class}) @RequestBody RepairApplicationFormDTO repairApplicationFormDTO) {
+        return new R<>(repairApplicationFormService.saveModelByDTO(repairApplicationFormDTO));
     }
 
     /**