From 0794169efd37a43f24a41617097bfb60df348e76 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 14 Mar 2024 10:08:52 +0800
Subject: [PATCH] 报汛新增水库注册码、水库编码、工程规模查询
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java | 15 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java | 16 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 65 +++++++++++++++++++++++++++++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java | 2
4 files changed, 82 insertions(+), 16 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 80ec17f..a6e4120 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
@@ -40,14 +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);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
index 0c6487c..560ee04 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
@@ -107,7 +107,7 @@
private String taskId;
/**
- * 行政区划
+ * 行政区划(数据库只存了countyCode,没用)
*/
@ApiModelProperty("行政区划")
private String adCode;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
index 363a65b..7f2435b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -28,18 +28,57 @@
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
+ <result property="cityCode" column="cityCode"/>
+ <result property="cityName" column="cityName"/>
+ <result property="countyCode" column="countyCode"/>
+ <result property="countyName" column="countyName"/>
+ <result property="townCode" column="townCode"/>
+ <result property="townName" column="townName"/>
+
+ <result property="engScal" column="engScal"/>
+ <result property="resRegCode" column="resRegCode"/>
+
</resultMap>
<select id="selectReportFloodRecordPages" resultMap="vo">
- SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
- LEFT JOIN "SJZT_MD"."att_res_base" atb on atb."guid" = r.reservoir_id
+ SELECT R.*,
+ arb."name" reservoirName ,
+
+ arb."res_reg_code" as resRegCode,
+ arb."eng_scal" as engScal,
+
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
+
+ case when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
+ case when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
+
+ case when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS cityCode,
+ case when town."ad_grad" = 2 THEN town."ad_name"
+ when county."ad_grad" = 2 THEN county."ad_name"
+ ELSE city."ad_name" END AS cityName
+
+
+
+ FROM SM_REPORT_FLOOD_RECORD r
+ LEFT JOIN "SJZT_MD"."att_res_base" arb on arb."guid" = r.reservoir_id
+
+ LEFT JOIN SJZT_MD."att_ad_base"town ON arb."interior_ad_guid" = town."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
+
WHERE r.is_deleted = 0
- <if test="reportFloodRecord.adCode !=null and reportFloodRecord.adCode !=''">
- AND r.ad_code LIKE CONCAT('%',#{reportFloodRecord.adCode},'%')
+ <if test=" reportFloodRecord.adCode!= null and reportFloodRecord.adCode !='' ">
+ AND CONCAT(province."ad_code",city."ad_code",county."ad_code",town."ad_code") LIKE CONCAT('%',#{reportFloodRecord.adCode},'%')
</if>
<if test="reportFloodRecord.reservoirName != null and reportFloodRecord.reservoirName !=''">
- AND atb."name" LIKE CONCAT('%',#{reportFloodRecord.reservoirName},'%')
+ AND arb."name" LIKE CONCAT('%',#{reportFloodRecord.reservoirName},'%')
</if>
<if test="reportFloodRecord.isAudit != null and reportFloodRecord.isAudit !=''">
AND r.is_audit = #{reportFloodRecord.isAudit}
@@ -56,6 +95,18 @@
<if test="reportFloodRecord.createUser !=null and reportFloodRecord.createUser !=''">
AND r.create_user = #{reportFloodRecord.createUser}
</if>
+
+ <if test="reportFloodRecord.resRegCode != null and reportFloodRecord.resRegCode != ''">
+ AND arb."res_reg_code" LIKE CONCAT('%',#{reportFloodRecord.resRegCode},'%')
+ </if>
+ <if test="reportFloodRecord.reservoirId != null and reportFloodRecord.reservoirId != ''">
+ AND r.reservoir_id LIKE CONCAT('%',#{reportFloodRecord.reservoirId},'%')
+ </if>
+ <if test="reportFloodRecord.engScal != null and reportFloodRecord.engScal != ''">
+ AND arb."eng_scal" = #{reportFloodRecord.engScal}
+ </if>
+
+
ORDER BY CREATE_TIME DESC
</select>
<select id="customizeGetDetail" resultMap="vo">
@@ -69,8 +120,8 @@
</select>
<select id="getDetailVO" resultMap="vo">
- SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
- LEFT JOIN "SJZT_MD"."att_res_base" atb on atb."guid" = r.reservoir_id
+ SELECT R.*,arb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
+ LEFT JOIN "SJZT_MD"."att_res_base" arb on arb."guid" = r.reservoir_id
WHERE r.is_deleted = 0 AND r.id = #{id}
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java
index d244c1a..87a5417 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java
@@ -20,4 +20,19 @@
* 结束时间
*/
private String endTime;
+
+
+ private String cityName;
+ private String cityCode;
+ private String countyName;
+ private String countyCode;
+ private String townName;
+ private String townCode;
+
+ //注册登记码
+ private String resRegCode;
+ //工程规模
+ private String engScal;
+
+
}
--
Gitblit v1.9.3