bug修改

src/main/java/org/springblade/founder/tjfx/mapper/AjtjMapper.xml

@@ -669,6 +669,7 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
     </select>
     <select id="getSwryList" resultType="org.springblade.founder.tjfx.entity.TbXwRybh">
         <include refid="pagination-head" />
+        select
         rybh.xxzjbh,
         rybh.asjbh,
         rybh.bhr_asjxgrybh bhrAsjxgrybh,
@@ -705,6 +706,7 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
                 </foreach>
             </foreach>
         </if>
+        order by asj.larq desc
         <include refid="pagination-tail" />
     </select>
     <select id="getSwryListCount" resultType="java.lang.Integer">
@@ -730,12 +732,15 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
         </if>
     </select>
     <select id="getZaryList" resultType="org.springblade.founder.tjfx.entity.TbXwZbfzxyr">
+        <include refid="pagination-head" />
         SELECT
         xyr.ZHFZXYR_XM zhfzxyrXm,xyr.ZHFZXYR_ASJXGRYBH rybh,
         (select name from sys_dictitem d where d.groupid = 'CODE_XB' and
         xyr.ZHFZXYR_XBDM=d.code) zhfzxyrXbdm,
         xyr.ZHFZXYR_CYZJ_ZJHM zhfzxyrCyzjZjhm,
         xyr.ZHFZXYR_HJDZ_DZMC hjdzDzmc,
+        (select name from sys_dictitem where groupid='CODE_XZQH' and code=xyr.ZHFZXYR_HJDZ_XZQHDM) as hjdzXzqhdm,
+        xyr.zhfzxyr_xzz_dzmc as xzdDzmc,
         xyr.ASJBH,
         (select name from sys_dictitem d where d.groupid = 'CODE_DAZT' and
         xyr.ZHFZXYR_FZXYRDAZTDM=d.code) zhfzxyrFzxyrdaztdm,
@@ -760,6 +765,8 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
                 </foreach>
             </foreach>
         </if>
+        order by xyr.ZHRQ desc nulls last
+        <include refid="pagination-tail" />
     </select>
     <select id="getZaryListCount" resultType="java.lang.Integer">
 

src/main/java/org/springblade/founder/tjfx/mapper/TjfxMapper.xml

@@ -150,7 +150,8 @@
 
     <sql id="aj-common-column">
         asj.asjbh as asjbh,
-        (SELECT name FROM code_gxs WHERE code = asj.ladw_Gajgjgdm) AS ladwGajgmc,
+
+         asj.ladw_Gajgmc AS ladwGajgmc,
         asj.ZCZJ_ZXSJ01 AS zczjZxsj01,
         asj.larq AS larq,
         asj.asjfssj_Asjfskssj AS asjfssjAsjfskssj,