Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_java
This commit is contained in:
commit
ef0cdebd16
|
@ -284,7 +284,7 @@
|
||||||
AND EV.evaluationver = '3'
|
AND EV.evaluationver = '3'
|
||||||
AND QUE.QUETYPE = '3') EVSTMP
|
AND QUE.QUETYPE = '3') EVSTMP
|
||||||
ORDER BY QUEID) EVS
|
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
|
ON EVS.EVALUATIONID = EV.ID
|
||||||
LEFT JOIN KC_KETANGBIAO KT
|
LEFT JOIN KC_KETANGBIAO KT
|
||||||
ON EVS.KETANGBIAOID = KT.ID
|
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 EV.evaluationver = '2'
|
||||||
AND EVS.EVALUATIONID = #{col00}
|
AND EVS.EVALUATIONID = #{col00}
|
||||||
AND QUE.QUETYPE = '3') EVS
|
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
|
ON EVS.EVALUATIONID = EV.ID
|
||||||
LEFT JOIN KC_KETANGBIAO KT
|
LEFT JOIN KC_KETANGBIAO KT
|
||||||
ON EVS.KETANGBIAOID = KT.ID
|
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 EVS.EVALUATIONID = #{col00}
|
||||||
AND QUE.QUETYPE = '3') EVSTMP
|
AND QUE.QUETYPE = '3') EVSTMP
|
||||||
ORDER BY QUEID) EVS
|
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
|
ON EVS.EVALUATIONID = EV.ID
|
||||||
LEFT JOIN KC_KETANGBIAO KT
|
LEFT JOIN KC_KETANGBIAO KT
|
||||||
ON EVS.KETANGBIAOID = KT.ID
|
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'
|
AND QUE.id = '1'
|
||||||
) EVSTMP
|
) EVSTMP
|
||||||
ORDER BY QUEID) EVS
|
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
|
ON EVS.EVALUATIONID = EV.ID
|
||||||
LEFT JOIN KC_KETANGBIAO KT
|
LEFT JOIN KC_KETANGBIAO KT
|
||||||
ON EVS.KETANGBIAOID = KT.ID
|
ON EVS.KETANGBIAOID = KT.ID
|
||||||
|
|
|
@ -326,6 +326,11 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
||||||
kcEvaluation.setStartTime(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
|
kcEvaluation.setStartTime(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
|
||||||
kcEvaluation.setEndTime(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
|
kcEvaluation.setEndTime(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
|
||||||
}
|
}
|
||||||
|
if(org.apache.commons.lang3.StringUtils.equals("是",kcEvaluation.getSzkc())){
|
||||||
|
kcEvaluation.setSzkc("1");
|
||||||
|
}else if(org.apache.commons.lang3.StringUtils.equals("否",kcEvaluation.getSzkc())){
|
||||||
|
kcEvaluation.setSzkc("0");
|
||||||
|
}
|
||||||
IPage<KcEvaluation> pageList = kcEvaluationService.getPkmxbList(page, kcEvaluation);
|
IPage<KcEvaluation> pageList = kcEvaluationService.getPkmxbList(page, kcEvaluation);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -346,4 +346,7 @@ public class KcEvaluation implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String shijian;
|
private String shijian;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String szkc;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,11 +46,11 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getPkmxbList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
<select id="getPkmxbList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
||||||
SELECT pk.*, au.assess1 as tksf,xnxq.title as xqxn FROM
|
SELECT pk.*, au.assess1 as tksf,xnxq.title as xqxn,if(kcb.szkc='1','是','否') as szkc FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
k.id,c.gh as userid, c.xm as username, c.dwh as college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver,
|
k.id,c.gh as userid, c.xm as username, c.dwh as college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver,
|
||||||
k.bz,k.skrq,
|
k.bz,k.skrq,k.kechengbiaoid,
|
||||||
p.source
|
p.source
|
||||||
FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
|
FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
|
||||||
WHERE
|
WHERE
|
||||||
|
@ -72,6 +72,7 @@
|
||||||
FROM kc_tksfrzb
|
FROM kc_tksfrzb
|
||||||
) au ON pk.userid = au.usercode
|
) au ON pk.userid = au.usercode
|
||||||
LEFT JOIN kc_xqxn_history xnxq on pk.skrq >= xnxq.start_time and pk.skrq <= xnxq.end_time
|
LEFT JOIN kc_xqxn_history xnxq on pk.skrq >= xnxq.start_time and pk.skrq <= xnxq.end_time
|
||||||
|
left join kc_kechengbiao kcb on pk.kechengbiaoid = kcb.id
|
||||||
<where>
|
<where>
|
||||||
<if test="kcEvaluation.kcxz != null and kcEvaluation.kcxz != ''">
|
<if test="kcEvaluation.kcxz != null and kcEvaluation.kcxz != ''">
|
||||||
and pk.kcxz = #{kcEvaluation.kcxz}
|
and pk.kcxz = #{kcEvaluation.kcxz}
|
||||||
|
@ -85,6 +86,14 @@
|
||||||
<if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">
|
<if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">
|
||||||
AND au.assess1 = #{kcEvaluation.tksf}
|
AND au.assess1 = #{kcEvaluation.tksf}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="kcEvaluation.szkc != null and kcEvaluation.szkc != ''">
|
||||||
|
<if test='kcEvaluation.szkc == "1"'>
|
||||||
|
AND kcb.szkc = #{kcEvaluation.szkc}
|
||||||
|
</if>
|
||||||
|
<if test='kcEvaluation.szkc == "0"'>
|
||||||
|
AND (kcb.szkc = #{kcEvaluation.szkc} or kcb.szkc is null )
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY
|
ORDER BY
|
||||||
up_date DESC,
|
up_date DESC,
|
||||||
|
|
|
@ -285,6 +285,11 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assess1",kcTingke.getTksf());
|
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assess1",kcTingke.getTksf());
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"tk.kkdw",kcTingke.getKkdw());
|
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"tk.kkdw",kcTingke.getKkdw());
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKcxz()),"tk.kcxz",kcTingke.getKcxz());
|
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKcxz()),"tk.kcxz",kcTingke.getKcxz());
|
||||||
|
if(StringUtils.equals("是",kcTingke.getSzkc())){
|
||||||
|
queryWrapper.eq("kcb.szkc","1");
|
||||||
|
}else if(StringUtils.equals("否",kcTingke.getSzkc())){
|
||||||
|
queryWrapper.apply(" (kcb.szkc = '0' or kcb.szkc is null )");
|
||||||
|
}
|
||||||
// AND ( cn LIKE '%jiaoshi%' )
|
// AND ( cn LIKE '%jiaoshi%' )
|
||||||
// AND c.college = '国际合作与交流处'
|
// AND c.college = '国际合作与交流处'
|
||||||
// AND assesscode = '1101'
|
// AND assesscode = '1101'
|
||||||
|
|
|
@ -255,6 +255,8 @@ public class KcTingke implements Serializable {
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String xnxq;
|
private String xnxq;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String szkc;
|
||||||
|
|
||||||
|
|
||||||
// private java.lang.String tingketime;
|
// private java.lang.String tingketime;
|
||||||
|
|
|
@ -96,7 +96,8 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getTkmxlist" resultType="org.jeecg.modules.kc.tktj.entity.KcTingke">
|
<select id="getTkmxlist" resultType="org.jeecg.modules.kc.tktj.entity.KcTingke">
|
||||||
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
|
FROM
|
||||||
( SELECT k.*, t.tingketime, c.USER, c.college, c.cn
|
( SELECT k.*, t.tingketime, c.USER, c.college, c.cn
|
||||||
FROM kc_ketangbiao k, kc_tingke t, kc_casusers c
|
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
|
LEFT JOIN (SELECT gh as usercode,xm as username, GROUP_CONCAT(zwmc) assess1
|
||||||
FROM kc_tksfrzb
|
FROM kc_tksfrzb
|
||||||
GROUP BY gh) sf ON tk.USER = sf.usercode
|
GROUP BY gh) sf ON tk.USER = sf.usercode
|
||||||
|
left join kc_kechengbiao kcb on tk.kechengbiaoid = kcb.id
|
||||||
|
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
ORDER BY
|
ORDER BY
|
||||||
|
|
Loading…
Reference in New Issue