删除巡检计划

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -67,8 +67,8 @@ public class PlanManageController {
         record.setTaskType(taskType);
         record.setTaskChecked(taskChecked);
         record.setPlanDate(new Date());
-        record.setPlanStartDate(DatesUtil.parseDate(planStartDate,"yyyy-MM-dd HH:mm:ss"));
-        record.setPlanEndDate(DatesUtil.parseDate(planEndDate,"yyyy-MM-dd HH:mm:ss"));
+        record.setPlanStartDate(DatesUtil.parseDate(planStartDate,"yyyy-MM-dd"));
+        record.setPlanEndDate(DatesUtil.parseDate(planEndDate,"yyyy-MM-dd"));
         record.setPlanStatus(0);
         record.setTaskContent(taskContent);
         record.setTaskAreaShape(taskAreaShape);
@@ -207,37 +207,36 @@ public class PlanManageController {
     }
 
 
-    @GetMapping("/plan/selecttask")
-    @ApiOperation(value = "查询巡检任务")
-    public AjaxMessage<Pagination<PlanManageDto>> selecttask(
-            @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
-            @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
-            @ApiParam(value = "状态", required = false) @RequestParam(required = false) Integer planStatus,
-            @ApiParam(value = "计划单号或计划名称", required = false) @RequestParam(required = false) String key,
-            @ApiParam(value = "计划安排起始日期", required = false) @RequestParam(required = false) String startDate,
-            @ApiParam(value = "计划安排截至日期", required = false) @RequestParam(required = false) String endDate){
-        PlanManageDto planManageDto = new PlanManageDto();
-        //根据用户编号，获取用户的权限
-        LoginUser loginUser = UserUtil.getCurrentUser();
-        planManageDto.setKey(key);
-        if(!StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
-            planManageDto.setStartDate(startDate);
-            planManageDto.setEndDate(endDate);
-        }
-        planManageDto.setPlanStatus(planStatus);
-        planManageDto.setTenantId(loginUser.getTenantId());
-        planManageDto.setProgramItems(loginUser.getProgramItemList());
-        planManageDto.setUserType(loginUser.getType());
-        //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
-        planManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
-        iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
-        for(PlanManage plan : pages.getList()){
-            //plan.setCompanyOrgName(orgInfoUtil.getOrgName(plan.getCompanyOrgId()));
-            //plan.setDeptOrgName(orgInfoUtil.getOrgName(plan.getDeptOrgId()));
-        }
-        return new AjaxMessage<>(ResultStatus.OK, pages);
-    }
-
+//    @GetMapping("/plan/selecttask")
+//    @ApiOperation(value = "查询巡检任务")
+//    public AjaxMessage<Pagination<PlanManageDto>> selecttask(
+//            @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
+//            @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
+//            @ApiParam(value = "状态", required = false) @RequestParam(required = false) Integer planStatus,
+//            @ApiParam(value = "计划单号或计划名称", required = false) @RequestParam(required = false) String key,
+//            @ApiParam(value = "计划安排起始日期", required = false) @RequestParam(required = false) String startDate,
+//            @ApiParam(value = "计划安排截至日期", required = false) @RequestParam(required = false) String endDate){
+//        PlanManageDto planManageDto = new PlanManageDto();
+//        //根据用户编号，获取用户的权限
+//        LoginUser loginUser = UserUtil.getCurrentUser();
+//        planManageDto.setKey(key);
+//        if(!StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
+//            planManageDto.setStartDate(startDate);
+//            planManageDto.setEndDate(endDate);
+//        }
+//        planManageDto.setPlanStatus(planStatus);
+//        planManageDto.setTenantId(loginUser.getTenantId());
+//        planManageDto.setProgramItems(loginUser.getProgramItemList());
+//        planManageDto.setUserType(loginUser.getType());
+//        //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+//        planManageDto.setPermissonType(loginUser.getPermissonType());
+//        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
+//        iPage = planManageService.selectPage(iPage, planManageDto);
+//        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+//        for(PlanManage plan : pages.getList()){
+//            //plan.setCompanyOrgName(orgInfoUtil.getOrgName(plan.getCompanyOrgId()));
+//            //plan.setDeptOrgName(orgInfoUtil.getOrgName(plan.getDeptOrgId()));
+//        }
+//        return new AjaxMessage<>(ResultStatus.OK, pages);
+//    }
 }

operation_manager/src/main/java/com/huaxu/task/entity/PlanManage.java

@@ -37,11 +37,11 @@ public class PlanManage implements Serializable {
     @ApiModelProperty(value = "计划安排时间")
     private Date planDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @ApiModelProperty(value = "开始时间")
     private Date planStartDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @ApiModelProperty(value = "结束时间")
     private Date planEndDate;