yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-05-19 21:29:18 +08:00
parent cc5047758f
commit fb0d553c82
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
View File

@ -5,7 +5,9 @@
<select id="getIndexList" resultType="org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike"> <select id="getIndexList" resultType="org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike">
SELECT * from ( SELECT * from (
SELECT * from ( SELECT * from (
select *,'1' as type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') select * from (
select *,'1' as type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc
) a2
union union
select *,'2' as type from kc_gongkaike where rq &lt; DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc select *,'2' as type from kc_gongkaike where rq &lt; DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc
) a ORDER BY type asc ) a ORDER BY type asc

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
View File

@ -69,6 +69,9 @@
<if test="kcKetangbiao.kcxz!=null and kcKetangbiao.kcxz!=''"> <if test="kcKetangbiao.kcxz!=null and kcKetangbiao.kcxz!=''">
and ktb.kcxz = #{kcKetangbiao.kcxz} and ktb.kcxz = #{kcKetangbiao.kcxz}
</if> </if>
<if test="kcKetangbiao.skdd!=null and kcKetangbiao.skdd!=''">
and ktb.skdd like concat('%',#{kcKetangbiao.skdd},'%')
</if>
<if test="kcKetangbiao.kkdw!=null and kcKetangbiao.kkdw!=''"> <if test="kcKetangbiao.kkdw!=null and kcKetangbiao.kkdw!=''">
and ktb.kkdw = #{kcKetangbiao.kkdw} and ktb.kkdw = #{kcKetangbiao.kkdw}
</if> </if>

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
View File

@ -42,6 +42,9 @@
<if test="kcTingke.kcxz!=null and kcTingke.kcxz!=''"> <if test="kcTingke.kcxz!=null and kcTingke.kcxz!=''">
AND kcxz = #{kcTingke.kcxz} AND kcxz = #{kcTingke.kcxz}
</if> </if>
<if test="kcTingke.username!=null and kcTingke.username!=''">
AND (tk.username like CONCAT('%',#{kcTingke.username},'%') or tk.userid like CONCAT('%',#{kcTingke.username},'%'))
</if>
GROUP BY tk.userid, tk.username, college GROUP BY tk.userid, tk.username, college
) tk LEFT JOIN ( ) tk LEFT JOIN (
SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc