巡查逻辑修改

guoshilong

2023-07-12 b176ddd3a9acdd1eef2e7eb9c0cef5fa620334b4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java

@@ -48,8 +48,6 @@
            reportFloodRecord.setAdCode(code.substring(0,4));
         }
      }


      IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
      return R.data(pageList);
   }
@@ -85,7 +83,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(reportFloodRecordService.removeById(id));
   }
@@ -97,7 +95,7 @@
    * @return
    */
   @ApiOperation(value = "报汛记录-批量删除", notes = "报汛记录-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   @PostMapping(value = "/deleteBatch")
   public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
      return R.data(this.reportFloodRecordService.removeByIds(Arrays.asList(ids.split(","))));
   }
@@ -111,7 +109,20 @@
   @ApiOperation(value = "报汛记录-通过id查询", notes = "报汛记录-通过id查询")
   @GetMapping(value = "/queryById")
   public R queryById(@RequestParam(name = "id", required = true) String id) {
      ReportFloodRecord reportFloodRecord = reportFloodRecordService.getById(id);
      ReportFloodRecordVO reportFloodRecord = reportFloodRecordService.getDetailVO(id);
      return R.data(reportFloodRecord);
   }

   /**
    * 根据水库id返回最新审核通过的报汛记录
    *
    * @param reservoirId
    * @return
    */
   @ApiOperation(value = "报汛记录-根据水库id返回最新审核通过的报汛记录", notes = "报汛记录-根据水库id返回最新审核通过的报汛记录")
   @GetMapping(value = "/getLatestRecord")
   public R getLatestRecord(String reservoirId) {
      ReportFloodRecord reportFloodRecord = reportFloodRecordService.getLatestRecord(reservoirId);
      return R.data(reportFloodRecord);
   }
}