From 742d5c02e405847d8b88578d940c9f0af8e990eb Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 13 Nov 2023 20:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=9D=E6=94=BF=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/KcEvaluationsStatMapper.xml | 8 ++++---- .../kc/qa/controller/KcEvaluationController.java | 5 +++++ .../jeecg/modules/kc/qa/entity/KcEvaluation.java | 3 +++ .../modules/kc/qa/mapper/xml/KcEvaluationMapper.xml | 13 +++++++++++-- .../kc/tktj/controller/KcTingkeController.java | 5 +++++ .../org/jeecg/modules/kc/tktj/entity/KcTingke.java | 2 ++ .../modules/kc/tktj/mapper/xml/KcTingkeMapper.xml | 4 +++- 7 files changed, 33 insertions(+), 7 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index a670dc85..1fbefa9d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -284,7 +284,7 @@ AND EV.evaluationver = '3' AND QUE.QUETYPE = '3') EVSTMP ORDER BY QUEID) EVS - 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 + LEFT JOIN (select * from KC_EVALUATION ev left join (select distinct gh,dwmc,xm,sf,zt,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn}) rjzy on ev.upuserid = rjzy.gh) EV ON EVS.EVALUATIONID = EV.ID LEFT JOIN KC_KETANGBIAO KT ON EVS.KETANGBIAOID = KT.ID @@ -588,7 +588,7 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x AND EV.evaluationver = '2' AND EVS.EVALUATIONID = #{col00} AND QUE.QUETYPE = '3') EVS - 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 + LEFT JOIN (select * from KC_EVALUATION ev left join (select distinct gh,dwmc,xm,sf,zt,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn}) rjzy on ev.upuserid = rjzy.gh) EV ON EVS.EVALUATIONID = EV.ID LEFT JOIN KC_KETANGBIAO KT ON EVS.KETANGBIAOID = KT.ID @@ -864,7 +864,7 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x AND EVS.EVALUATIONID = #{col00} AND QUE.QUETYPE = '3') EVSTMP ORDER BY QUEID) EVS - 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 + LEFT JOIN (select * from KC_EVALUATION ev left join (select distinct gh,dwmc,xm,sf,zt,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn}) rjzy on ev.upuserid = rjzy.gh) EV ON EVS.EVALUATIONID = EV.ID LEFT JOIN KC_KETANGBIAO KT ON EVS.KETANGBIAOID = KT.ID @@ -1082,7 +1082,7 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x AND QUE.id = '1' ) EVSTMP ORDER BY QUEID) EVS - 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 + LEFT JOIN (select * from KC_EVALUATION ev left join (select distinct gh,dwmc,xm,sf,zt,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn}) rjzy on ev.upuserid = rjzy.gh) EV ON EVS.EVALUATIONID = EV.ID LEFT JOIN KC_KETANGBIAO KT ON EVS.KETANGBIAOID = KT.ID diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index 927e662b..6ed09bfe 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -326,6 +326,11 @@ public class KcEvaluationController extends JeecgController pageList = kcEvaluationService.getPkmxbList(page, kcEvaluation); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java index 7887a0ea..9cadba6f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java @@ -346,4 +346,7 @@ public class KcEvaluation implements Serializable { @TableField(exist = false) private String shijian; + @TableField(exist = false) + private String szkc; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index 21699e76..b4b2744e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -46,11 +46,11 @@ - SELECT tk.id, tk.user as userid, tk.cn as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime,tk.xnxq + SELECT tk.id, tk.user as userid, tk.cn as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime,tk.xnxq, + if(kcb.szkc='1','是','否') as szkc FROM ( SELECT k.*, t.tingketime, c.USER, c.college, c.cn FROM kc_ketangbiao k, kc_tingke t, kc_casusers c @@ -105,6 +106,7 @@ LEFT JOIN (SELECT gh as usercode,xm as username, GROUP_CONCAT(zwmc) assess1 FROM kc_tksfrzb GROUP BY gh) sf ON tk.USER = sf.usercode + left join kc_kechengbiao kcb on tk.kechengbiaoid = kcb.id ${ew.customSqlSegment} ORDER BY