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

修改生成规则

This commit is contained in:
yangjun 2023-10-18 19:24:41 +08:00
parent 959ad2ddd4
commit e873e31b43
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java
View File

@ -255,4 +255,6 @@ public class KcEvaluationsStat implements Serializable {
@Excel(name = "10.其它建议", width = 15)
@ApiModelProperty(value = "10.其它建议")
private java.lang.String col55;
private java.lang.String col56;
private java.lang.String col57;
}

33
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
View File

@ -82,7 +82,9 @@
YBTK.COL52,
YBTK.COL53,
YBTK.COL54,
YBTK.COL55
YBTK.COL55,
YBTK.COL56,
YBTK.COL57
FROM (SELECT EVS.EVALUATIONID AS COL00,
XQXN.TITLE AS COL01, -- 一般听课表(3)
KT.KCMC AS COL02,
@ -167,7 +169,9 @@
'' AS COL52,
'' AS COL53,
'' AS COL54,
'' AS COL55
'' AS COL55,
rjzy.rjzy as col56,
ev.rjzy as col57
FROM (SELECT UPUSER,
UPUSERID,
KETANGBIAOID,
@ -268,10 +272,11 @@
AND EV.evaluationver = '3'
AND QUE.QUETYPE = '3') EVSTMP
ORDER BY QUEID) EVS
LEFT JOIN KC_EVALUATION EV
LEFT JOIN (select * from KC_EVALUATION ev left join (select gh,tklx,dwmc,xm,sf,zt,ytkcs,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn in (select max(xqxn) from kc_export_config_tpkwcqkjzglx)) rjzy on ev.upuserid = rjzy.gh) EV
ON EVS.EVALUATIONID = EV.ID
LEFT JOIN KC_KETANGBIAO KT
ON EVS.KETANGBIAOID = KT.ID
left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
LEFT JOIN KC_XQXN_HISTORY XQXN
ON KT.SKRQ >= XQXN.START_TIME
AND KT.SKRQ <= XQXN.END_TIME
@ -345,7 +350,9 @@
XSTK.COL52,
XSTK.COL53,
XSTK.COL54,
XSTK.COL55
XSTK.COL55,
XSTK.COL56,
XSTK.COL57
FROM (SELECT EVS.evaluationid AS COL00,
XQXN.TITLE AS COL01, -- 线上听课表(2)
KT.KCMC AS COL02,
@ -430,7 +437,9 @@
'' AS COL52,
'' AS COL53,
'' AS COL54,
'' AS COL55
'' AS COL55,
rjzy.rjzy as col56,
ev.rjzy as col57
FROM (SELECT EVS.UPUSER,
EVS.UPUSERID,
EVS.KETANGBIAOID,
@ -559,10 +568,11 @@
AND EV.evaluationver = '2'
AND EVS.EVALUATIONID = #{col00}
AND QUE.QUETYPE = '3') EVS
LEFT JOIN KC_EVALUATION EV
LEFT JOIN (select * from KC_EVALUATION ev left join (select gh,tklx,dwmc,xm,sf,zt,ytkcs,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn in (select max(xqxn) from kc_export_config_tpkwcqkjzglx)) rjzy on ev.upuserid = rjzy.gh) EV
ON EVS.EVALUATIONID = EV.ID
LEFT JOIN KC_KETANGBIAO KT
ON EVS.KETANGBIAOID = KT.ID
left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
LEFT JOIN KC_XQXN_HISTORY XQXN
ON KT.SKRQ >= XQXN.START_TIME
AND KT.SKRQ <= XQXN.END_TIME
@ -636,7 +646,9 @@
THPJ.COL52,
THPJ.COL53,
THPJ.COL54,
THPJ.COL55
THPJ.COL55,
THPJ.COL56,
THPJ.COL57
FROM (SELECT EVS.EVALUATIONID AS COL00,
XQXN.TITLE AS COL01, -- 同行评价表(4)
KT.KCMC AS COL02,
@ -721,7 +733,9 @@
'' AS COL52,
'' AS COL53,
'' AS COL54,
'' AS COL55
'' AS COL55,
rjzy.rjzy as col56,
ev.rjzy as col57
FROM (SELECT UPUSER,
UPUSERID,
KETANGBIAOID,
@ -822,10 +836,11 @@
AND EVS.EVALUATIONID = #{col00}
AND QUE.QUETYPE = '3') EVSTMP
ORDER BY QUEID) EVS
LEFT JOIN KC_EVALUATION EV
LEFT JOIN (select * from KC_EVALUATION ev left join (select gh,tklx,dwmc,xm,sf,zt,ytkcs,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn in (select max(xqxn) from kc_export_config_tpkwcqkjzglx)) rjzy on ev.upuserid = rjzy.gh) EV
ON EVS.EVALUATIONID = EV.ID
LEFT JOIN KC_KETANGBIAO KT
ON EVS.KETANGBIAOID = KT.ID
left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
LEFT JOIN KC_XQXN_HISTORY XQXN
ON KT.SKRQ >= XQXN.START_TIME
AND KT.SKRQ <= XQXN.END_TIME

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
View File

@ -307,4 +307,7 @@ public class KcKetangbiao implements Serializable {
private String title;
@TableField(exist = false)
private String notes;
@TableField(exist = false)
private String sftkb;
}

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

@ -35,7 +35,7 @@
<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, case when js.jsbh is NULL then 0 else 1 end sfyzhjs,
if(jc.hhjs is null,'00:00:00',concat(substr(jc.hhjs,1,2),':',substr(jc.hhjs,3,4),':00')) as jssj,kcb.szkc
if(jc.hhjs is null,'00:00:00',concat(substr(jc.hhjs,1,2),':',substr(jc.hhjs,3,4),':00')) as jssj,kcb.szkc,IF(tkxx.kcmc is null,'0','1') as sftkb
from kc_ketangbiao ktb
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
@ -43,6 +43,8 @@
left join xxhbjxljbxx jxljbxx on jsjbxx.jxlh = jxljbxx.jzwh
left join kc_jieci jc on ktb.hh = jc.jieci
left join kc_kechengbiao kcb on kcb.kcmc = ktb.kcmc and kcb.kcxz = ktb.kcxz and kcb.skjs = ktb.skjs and kcb.skdd=ktb.skdd and kcb.kkdw = ktb.kkdw and kcb.kcbh = ktb.kcbh and kcb.id = ktb.kechengbiaoid
left join (select distinct tkxx.xm,tkxx.kcmc,concat(substring(tkxx.skrq,1,4),'-',substring(tkxx.skrq,5,2),'-',substring(tkxx.skrq,7,2)) as skrq,tkxx.skjs from xxhbtkxx tkxx where tkxx.skrq is not null) tkxx
on ktb.kcmc =tkxx.kcmc and ktb.skrq = tkxx.skrq and ktb.skdd=tkxx.skjs and ktb.skjs = tkxx.xm
<where>
and ktb.is_delete = 0
<if test="kcKetangbiao.ywmc!=null and kcKetangbiao.ywmc!=''">