guoshilong
2023-05-23 1df02b011c951ed5f57e40663e014fd913cbbe20
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(","))));
   }
@@ -290,9 +290,19 @@
    */
   @PostMapping("getTaskReport")
   @ApiOperation(value = "巡查任务报表")
   public R getTaskReport(@RequestBody PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = patrolTaskService.getTaskReport(patrolTaskReport);
      return R.data(list);
   public R getTaskReport( PatrolTaskReport patrolTaskReport , Query query) {
      IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReport(Condition.getPage(query),patrolTaskReport);
      return R.data(pageList);
   }
   /**
    * 巡查任务报表
    */
   @PostMapping("getTaskReportDetail")
   @ApiOperation(value = "巡查任务报表")
   public R getTaskReportDetail( PatrolTaskReport patrolTaskReport , Query query) {
      IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportDetail(Condition.getPage(query),patrolTaskReport);
      return R.data(pageList);
   }