2025-10-13 wj 整体修改3

qianhe-ydsj/src/main/resources/mapper/SjGfjsZdgzMapper.xml

@@ -114,13 +114,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 1
         limit 1
     </select>
     </select>
     <select id="selectSjGfjsZdgzCxBzList" resultType="com.qianhe.domain.SjGfjsZdgzCb">
     <select id="selectSjGfjsZdgzCxBzList" resultType="com.qianhe.domain.SjGfjsZdgzCb">
-        select a.khnr,a.khxd
+        select a.khnr,a.khxd,a.xppx
         from sj_gfjs_zdgz a
         from sj_gfjs_zdgz a
         left join sj_gfjs_zdgz_cb b on a.id = b.zb_id
         left join sj_gfjs_zdgz_cb b on a.id = b.zb_id
         where 1=1
         where 1=1
           and a.lx=#{lx} and a.nd =#{nd}
           and a.lx=#{lx} and a.nd =#{nd}
-        group by a.khnr,a.khxd
-        order by  (case when a.khnr='党建引领' then 1 when a.khnr='素质提升' then 2 when a.khnr='管理精益' then 3 else 4 end) ,a.xppx,b.px
+        group by a.khnr,a.khxd,a.xppx
+        order by  (case when a.khnr='党建引领' then 1 when a.khnr='素质提升' then 2 when a.khnr='管理精益' then 3 else 4 end) ,a.xppx
     </select>
     </select>