From 35b52cca16b0a00cac08a52cd554a77e6ce0dae0 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Fri, 10 Jan 2025 11:03:39 +0800
Subject: [PATCH] bz

---
 .../resources/mappers/jhgk/DmYdjhMapper.xml   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index fdf4fdb..5d3d82b 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -963,12 +963,13 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         SELECT
         dm_ydjh.dc_ch,
         dm_ydjh.dc_pl,
-        dm_ydjh.jssj,
-        dm_ydjh.sljhrq,
-        dm_ydjh.pwjhrq,
-        dm_ydjh.lljhrq,
-        dm_ydjh.hxjhrq,
-        dm_ydjh.qgjhrq,
+        isnull( min (dm_ydjh.jssj) ,'')as jssj,
+        isnull( min (dm_ydjh.sljhrq) ,'')as sljhrq,
+
+        isnull( min (dm_ydjh.pwjhrq) ,'')as pwjhrq,
+        isnull( min (dm_ydjh.lljhrq) ,'')as lljhrq,
+        isnull( min (dm_ydjh.hxjhrq) ,'')as hxjhrq,
+        isnull( min (dm_ydjh.qgjhrq) ,'')as qgjhrq,
         COUNT(dm_ydjh.id) AS bs,
         SUM(CASE WHEN ISNULL(dm_ydjh.slxhth, '') != '' THEN 1 ELSE 0 END) AS slxhth_count,
         SUM(CASE WHEN ISNULL(dm_ydjh.slfkry, '') != '' THEN 1 ELSE 0 END) AS sl_count,
@@ -994,17 +995,18 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         </if>
         GROUP BY
         dm_ydjh.dc_ch,
-        dm_ydjh.dc_pl,
-        dm_ydjh.jssj,
-        dm_ydjh.sljhrq,
-        dm_ydjh.pwjhrq,
-        dm_ydjh.lljhrq,
-        dm_ydjh.hxjhrq,
-        dm_ydjh.qgjhrq
+        dm_ydjh.dc_pl
+
         order by     dc_ch,dc_pl,jssj
 
 
     </select>
+<!--    dm_ydjh.jssj,-->
+<!--    dm_ydjh.sljhrq,-->
+<!--    dm_ydjh.pwjhrq,-->
+<!--    dm_ydjh.lljhrq,-->
+<!--    dm_ydjh.hxjhrq,-->
+<!--    dm_ydjh.qgjhrq-->
     <select id="getWcl" resultType="java.util.Map">
         SELECT
             *