巡查，智能外呼定时任务相关代码抽离修改

zhongrj

2023-06-03 b112d242575fe96123b1e8dad434f46e6d2bb3d1

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

@@ -124,7 +124,7 @@
    * @return
    */
   @ApiOperation(value = "巡查任务-通过id删除", notes = "巡查任务-通过id删除")
   @DeleteMapping(value = "/delete")
   @PostMapping(value = "/delete")
   public R delete(@RequestParam(name = "id", required = true) String id) {
      return R.data(patrolTaskService.removeById(id));
   }
@@ -136,7 +136,7 @@
    * @return
    */
   @ApiOperation(value = "巡查任务-批量删除", notes = "巡查任务-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   @PostMapping(value = "/deleteBatch")
   public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
      return R.data(patrolTaskService.removeByIds(Arrays.asList(ids.split(","))));
   }
@@ -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,14 +286,34 @@
   }

   /**
    * 巡查任务报表
    * 巡查任务报表 分页
    */
   @PostMapping("getTaskReport")
   @PostMapping("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);
   }

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

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


}