From a725657bb6f9fd7693441732985fb4e233363a50 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Jan 2024 11:53:12 +0800
Subject: [PATCH] 质量查询明细

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml |   75 +++++++++++++++----------------------
 1 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
index 2e67619..0c41cb5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
@@ -77,34 +77,36 @@
 
     <select id="selectCustomizePage" resultType="cn.gistack.sm.resDataCheck.vo.QualityManageDetailVO">
         SELECT
+            MAX(id) id,
             RES_ID,
-            is_gate,
-            eng_scal,
-            is_danger,
-            town_code,
-            town_name,
-            county_code,
-            county_name,
-            city_code,
-            city_name,
-            res_reg_code,
-            res_name,
-            rz,
-            tb_weir_top_elevation,
-            tb_norm_pool_stag,
-            tb_control_z,
-            tb_des_fl_stag,
-            tb_dam_top_elevation,
-            tb_dead_stag,
-            replace(wm_concat(remark),',',';') as remark
+            MAX(is_gate) is_gate,
+            MAX(eng_scal) eng_scal,
+            MAX(is_danger) is_danger,
+            MAX(town_code) town_code,
+            MAX(town_name) town_name,
+            MAX(county_code)county_code,
+            MAX(county_name)county_name,
+            MAX(city_code) city_code,
+            MAX(city_name) city_name,
+            MAX(res_reg_code) res_reg_code,
+            MAX(res_name) res_name,
+            MAX(rz) rz,
+            MAX(tb_weir_top_elevation) tb_weir_top_elevation,
+            MAX(tb_norm_pool_stag) tb_norm_pool_stag,
+            MAX(tb_control_z) tb_control_z,
+            MAX(tb_des_fl_stag) tb_des_fl_stag,
+            MAX(tb_dam_top_elevation) tb_dam_top_elevation,
+            MAX(tb_dead_stag) tb_dead_stag,
+            replace(wm_concat(remark),',',';') as remark,
+            MAX(create_time) create_time
         from YWXT.SM_RES_DATA_QUALITY_MANAGE_DETAIL
         where
             1=1
         <if test="vo.resId != null and vo.resId != ''">
-            res_id = #{vo.resId}
+            AND res_id = #{vo.resId}
         </if>
         <if test="vo.resName != null and vo.resName != ''">
-            res_name LIKE CONCAT('%', #{vo.resName},'%')
+            AND res_name LIKE CONCAT('%', #{vo.resName},'%')
         </if>
         <if test="vo.startTime != null and vo.startTime != ''">
             AND DATE_FORMAT(create_time,'%Y-%m-%d')  &gt;= #{vo.startTime}
@@ -113,36 +115,21 @@
             AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{vo.endTime}
         </if>
         <if test="vo.engScal != null and vo.engScal != ''">
-            eng_scal = #{vo.engScal}
+            and eng_scal = #{vo.engScal}
+        </if>
+        <if test="vo.isDanger != null and vo.isDanger != ''">
+            and is_danger = #{vo.isDanger}
         </if>
         <if test="vo.cityCode != null and vo.cityCode != ''">
-            city_code = #{vo.cityCode}
+            and city_code = #{vo.cityCode}
         </if>
         <if test="vo.countyCode != null and vo.countyCode != ''">
-           county_code = #{vo.countyCode}
+           and county_code = #{vo.countyCode}
         </if>
         <if test="vo.townCode != null and vo.townCode != ''">
-            town_code= #{vo.townCode}
+            and town_code= #{vo.townCode}
         </if>
         GROUP BY
-            RES_ID,
-            is_gate,
-            eng_scal,
-            is_danger,
-            town_code,
-            town_name,
-            county_code,
-            county_name,
-            city_code,
-            city_name,
-            res_reg_code,
-            res_name,
-            rz,
-            tb_weir_top_elevation,
-            tb_norm_pool_stag,
-            tb_control_z,
-            tb_des_fl_stag,
-            tb_dam_top_elevation,
-            tb_dead_stag
+            RES_ID
     </select>
 </mapper>

--
Gitblit v1.9.3