修改bug
This commit is contained in:
parent
a92826ce15
commit
09f92029df
|
|
@ -270,5 +270,7 @@ public class KcKetangbiao implements Serializable {
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String zhjsId;
|
private String zhjsId;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String sfyzhjs;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,10 @@
|
||||||
|
|
||||||
|
|
||||||
<select id="getKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
<select id="getKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
||||||
select ktb.*,if(yy.id is null,0,1) as sfyy,yy.isdeleted from kc_ketangbiao ktb
|
select ktb.*,if(yy.id is null,0,1) as sfyy,yy.isdeleted, case when js.jsbh is NULL then 0 else 1 end sfyzhjs
|
||||||
|
from kc_ketangbiao ktb
|
||||||
left join (select * from kc_yuyue where userid = #{kcKetangbiao.userid}) yy on ktb.id = yy.ketangbiaoid
|
left join (select * from kc_yuyue where userid = #{kcKetangbiao.userid}) yy on ktb.id = yy.ketangbiaoid
|
||||||
|
LEFT JOIN (SELECT DISTINCT jsbh, jsmc from kc_zhihuijiaoshi where sfyx=0) js on ktb.jsbh = js.jsbh
|
||||||
<where>
|
<where>
|
||||||
<if test="kcKetangbiao.ywmc!=null and kcKetangbiao.ywmc!=''">
|
<if test="kcKetangbiao.ywmc!=null and kcKetangbiao.ywmc!=''">
|
||||||
and (ktb.skjs like concat('%',#{kcKetangbiao.ywmc},'%') or ktb.kcmc like concat('%',#{kcKetangbiao.ywmc},'%') )
|
and (ktb.skjs like concat('%',#{kcKetangbiao.ywmc},'%') or ktb.kcmc like concat('%',#{kcKetangbiao.ywmc},'%') )
|
||||||
|
|
@ -70,6 +72,9 @@
|
||||||
<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>
|
||||||
|
<if test="kcKetangbiao.sfyzhjs!=null and kcKetangbiao.sfyzhjs!=''">
|
||||||
|
and js.jsbh is not NULL
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -461,7 +461,7 @@
|
||||||
left join (
|
left join (
|
||||||
SELECT
|
SELECT
|
||||||
id, user_id, ketangbiao_id, notes
|
id, user_id, ketangbiao_id, notes
|
||||||
FROM ( SELECT distinct id, user_id, ketangbiao_id, notes FROM kc_ketang_suibi WHERE
|
FROM ( SELECT distinct id, user_id, ketangbiao_id, notes, create_time FROM kc_ketang_suibi WHERE
|
||||||
<if test="userid != null and userid != ''">
|
<if test="userid != null and userid != ''">
|
||||||
user_id = #{userid}
|
user_id = #{userid}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue