Merge remote-tracking branch 'origin/master'

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,
+        isnull( min (dm_ydjh.jssj) ,'')as jssj,
-        dm_ydjh.sljhrq,
+        isnull( min (dm_ydjh.sljhrq) ,'')as sljhrq,
-        dm_ydjh.pwjhrq,
+
-        dm_ydjh.lljhrq,
+        isnull( min (dm_ydjh.pwjhrq) ,'')as pwjhrq,
-        dm_ydjh.hxjhrq,
+        isnull( min (dm_ydjh.lljhrq) ,'')as lljhrq,
-        dm_ydjh.qgjhrq,
+        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.dc_pl
-        dm_ydjh.jssj,
+
-        dm_ydjh.sljhrq,
-        dm_ydjh.pwjhrq,
-        dm_ydjh.lljhrq,
-        dm_ydjh.hxjhrq,
-        dm_ydjh.qgjhrq
         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
             *