添加巡逻路线

guoshilong

2023-05-24 4d07c1c65427f6ba3cb968ddf0d0b2b669187575

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

@@ -229,7 +229,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);
@@ -267,7 +267,7 @@
         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);
@@ -286,17 +286,27 @@
   }

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

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

   /**
    * 巡查任务报表 分页
    */
   @PostMapping("getTaskReportDetail")
   @ApiOperation(value = "巡查任务报表")