任务查询，按创建时间查询；白蚁大坝汛前巡查流程

guoshilong

2024-03-04 27b27564be25fd92edfe328a0e989ee8f4c4e7d3

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java

@@ -7,10 +7,7 @@
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
import cn.gistack.sm.patrol.vo.BladeFlowPage;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -164,7 +161,7 @@
   @ApiOperation(value = "巡查任务-自定义通过id查询", notes = "巡查任务-自定义通过id查询")
   @GetMapping(value = "/getPatrolTaskById")
   public R getPatrolTaskById(@RequestParam(name = "id", required = true) String id) {
      PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id);
      PatrolTask PatrolTask = patrolTaskService.customizeGetById(id);
      return R.data(PatrolTask);
   }

@@ -189,7 +186,7 @@
    */
   @PostMapping("start-process")
   public R startProcess(@RequestBody PatrolTask patrolTask) {
      return R.status(patrolTaskService.startProcess(patrolTask));
      return R.data(patrolTaskService.startProcess(patrolTask));
   }

   /**
@@ -211,6 +208,18 @@
   }

   /**
    * 汛期、白蚁、大坝 责任人完成任务
    */
   @PostMapping("person-complete-task")
   @ApiOperation(value = "完成任务", notes = "传入流程信息")
   public R personCompleteTask(@RequestBody PatrolTaskVO patrolTaskVO) {
      return R.status(patrolTaskService.personCompleteTask(patrolTaskVO, patrolTaskVO.getCurrentUserId(), patrolTaskVO.getTaskUser()));
   }




   /**
    * 查询待办
    *
    * @param patrolTask 任务
@@ -229,7 +238,7 @@
         List<Object> data = res.getData().getData();
         data.forEach(obj -> {
            BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
            PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            if (byId != null) {
               byId.setFlow(bladeFlow);
               patrolTaskList.add(byId);
@@ -254,7 +263,7 @@
    * @param patrolTask 任务
    */
   @PostMapping("patrol-done-list")
   @ApiOperation(value = "查询待办")
   @ApiOperation(value = "查询已办")
   public R patrolDoneList(PatrolTaskVO patrolTask, Query query) {
      BladeFlowVO bladeFlow2 = new BladeFlowVO();
      //设置流程类型
@@ -267,10 +276,12 @@
         List<Object> data = res.getData().getData();
         data.forEach(obj -> {
            BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
            PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());

            bladeFlow.setDetail(byId);
            bladeFlowVOList.add(bladeFlow);
            if (byId != null){
               bladeFlow.setDetail(byId);
               bladeFlowVOList.add(bladeFlow);
            }
         });
      }
      //设置数据集
@@ -286,14 +297,61 @@
   }

   /**
    * 巡查任务报表
    * 巡查任务报表 分页
    */
   @PostMapping("getTaskReport")
   @GetMapping("getTaskReportPage")
   @ApiOperation(value = "巡查任务报表")
   public R getTaskReport(@RequestBody PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = patrolTaskService.getTaskReport(patrolTaskReport);
   public R getTaskReportPage( PatrolTaskReport patrolTaskReport , Query query) {
      IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportPage(Condition.getPage(query),patrolTaskReport);
      return R.data(pageList);
   }

   /**
    * 巡查任务报表列表
    */
   @GetMapping("getTaskReportList")
   @ApiOperation(value = "巡查任务报表")
   public R getTaskReportList( PatrolTaskReport patrolTaskReport ) {
      List<PatrolTaskReport> list = patrolTaskService.getTaskReportList(patrolTaskReport);
      return R.data(list);
   }

   /**
    * 巡查任务报表详情
    */
   @GetMapping("getTaskReportDetail")
   @ApiOperation(value = "巡查任务详情")
   public R getTaskReportDetail( PatrolTaskReport patrolTaskReport , Query query) {
      IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportDetail(Condition.getPage(query),patrolTaskReport);
      return R.data(pageList);
   }

   @GetMapping("getTaskStatusCount")
   public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
//      List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
      List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
      return R.data(list);
   }

   @GetMapping("getTaskStatus")
   public R getTaskStatus(PatrolTaskVO patrolTaskVO){
      TaskStatus taskStatus = patrolTaskService.getTaskStatus(patrolTaskVO);
      return R.data(taskStatus);
   }

   @GetMapping("getTaskStatusCountOptimize")
   public R getTaskStatusCountOptimize(PatrolTaskVO patrolTaskVO){
      List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
      return R.data(list);
   }

   @GetMapping("getTaskTypeCount")
   public R getTaskTypeCount(PatrolTaskVO patrolTaskVO){
      List<TaskStatusCount> list = patrolTaskService.getTaskTypeCount(patrolTaskVO);
      return R.data(list);
   }




}