From 3de5848ecc5984b31ae847d216f3881924f9d927 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 21:11:24 +0800
Subject: [PATCH] 报汛调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index 7447c9b..90a6caf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -1,18 +1,10 @@
package cn.gistack.sm.reportFlood.controller;
import cn.gistack.flow.core.feign.IFlowClient;
-import cn.gistack.flow.core.vo.BladeFlowVO;
-import cn.gistack.sm.patrol.entity.PatrolConfig;
-import cn.gistack.sm.patrol.entity.PatrolTask;
-import cn.gistack.sm.patrol.service.IPatrolConfigService;
-import cn.gistack.sm.patrol.vo.BladeFlowPage;
-import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.reportFlood.entity.ReportFloodRecord;
import cn.gistack.sm.reportFlood.service.IReportFloodRecordService;
import cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -21,6 +13,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -45,8 +38,19 @@
*/
@ApiOperation(value = "报汛记录-分页列表查询", notes = "报汛记录-分页列表查询")
@GetMapping(value = "/list")
- public R<IPage<ReportFloodRecord>> queryPageList(ReportFloodRecord reportFloodRecord, Query query) {
- IPage<ReportFloodRecord> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
+ 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));
+ }
+ }
+
+
+ IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
return R.data(pageList);
}
--
Gitblit v1.9.3