报汛新增水库注册码、水库编码、工程规模查询

guoshilong

2024-03-14 0794169efd37a43f24a41617097bfb60df348e76

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

@@ -40,16 +40,14 @@
   @GetMapping(value = "/list")
   public R<IPage<ReportFloodRecordVO>> queryPageList(ReportFloodRecordVO reportFloodRecord, Query query) {

      String code = reportFloodRecord.getAdCode();
      if (StringUtil.isNoneBlank(code)){
         if (code.substring(0,4).indexOf("00") > -1) {
            reportFloodRecord.setAdCode(code.substring(0,2));
         } else if (code.substring(0,6).indexOf("00") > -1) {
            reportFloodRecord.setAdCode(code.substring(0,4));
         }
      }


//      String code = reportFloodRecord.getAdCode();
//      if (StringUtil.isNoneBlank(code)){
//         if (code.substring(0,4).indexOf("00") > -1) {
//            reportFloodRecord.setAdCode(code.substring(0,2));
//         } else if (code.substring(0,6).indexOf("00") > -1) {
//            reportFloodRecord.setAdCode(code.substring(0,4));
//         }
//      }
      IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
      return R.data(pageList);
   }
@@ -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);
   }
}