修改bug
This commit is contained in:
parent
a36e920d9a
commit
b63ea7f15d
|
@ -264,10 +264,10 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
||||||
List<KcEvaluation> exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation);
|
List<KcEvaluation> exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation);
|
||||||
Map<Integer,String> sourceDictMap = Maps.newHashMap();
|
Map<Integer,String> sourceDictMap = Maps.newHashMap();
|
||||||
//0:门户添加,1:老系统,2:政务大厅,3后台导入
|
//0:门户添加,1:老系统,2:政务大厅,3后台导入
|
||||||
sourceDictMap.put(0,"课程中心");
|
// sourceDictMap.put(0,"课程中心");
|
||||||
sourceDictMap.put(1,"老系统");
|
// sourceDictMap.put(1,"老系统");
|
||||||
sourceDictMap.put(2,"服务大厅");
|
// sourceDictMap.put(2,"服务大厅");
|
||||||
sourceDictMap.put(3,"线下纸质");
|
// sourceDictMap.put(3,"线下纸质");
|
||||||
//更改字典项
|
//更改字典项
|
||||||
exportList.forEach(x -> {
|
exportList.forEach(x -> {
|
||||||
x.setSourceName(sourceDictMap.get(x.getSource()));
|
x.setSourceName(sourceDictMap.get(x.getSource()));
|
||||||
|
|
|
@ -98,7 +98,6 @@ public class KcEvaluation implements Serializable {
|
||||||
@ApiModelProperty(value = "数据来源(0:课程中心,1:老系统,2:政务大厅,3:纸质评价)")
|
@ApiModelProperty(value = "数据来源(0:课程中心,1:老系统,2:政务大厅,3:纸质评价)")
|
||||||
private java.lang.Integer source;
|
private java.lang.Integer source;
|
||||||
|
|
||||||
@Excel(name = "评价来源", width = 15)
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String sourceName;
|
private String sourceName;
|
||||||
|
|
||||||
|
|
|
@ -267,21 +267,22 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<select id="selectKkdwExportList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
<select id="selectKkdwExportList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
||||||
SELECT
|
SELECT
|
||||||
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw, tk.source
|
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
|
||||||
FROM (
|
FROM (
|
||||||
SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwh AS tkdw,ev.source
|
SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwmc AS tkdw,kt.skrq
|
||||||
FROM
|
FROM
|
||||||
kc_evaluation ev,
|
kc_evaluation ev,
|
||||||
kc_ketangbiao kt,
|
kc_ketangbiao kt,
|
||||||
xxhbuser cu
|
xxhbuser cu
|
||||||
WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
|
WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
|
||||||
<if test="startTime != null and startTime != ''">
|
<if test="startTime != null and startTime != ''">
|
||||||
|
<!-- and ev.up_date >= #{kcEvaluation.startTime}-->
|
||||||
and kt.skrq >= #{startTime}
|
and kt.skrq >= #{startTime}
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null and endTime != ''">
|
<if test="endTime != null and endTime != ''">
|
||||||
|
<!-- and ev.up_date <= #{kcEvaluation.endTime}-->
|
||||||
and kt.skrq <= #{endTime}
|
and kt.skrq <= #{endTime}
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
@ -292,17 +293,21 @@
|
||||||
and kkdw = #{kkdw}
|
and kkdw = #{kkdw}
|
||||||
</if>
|
</if>
|
||||||
<if test="szdw != null and szdw != ''">
|
<if test="szdw != null and szdw != ''">
|
||||||
and cu.dwh = #{szdw}
|
and cu.dwmc = #{szdw}
|
||||||
</if>
|
</if>
|
||||||
GROUP BY ev.upuserid, ev.upuser, cu.dwh
|
|
||||||
) tk,
|
<if test="username != null and username != ''">
|
||||||
|
and (cu.xm like concat('%',#{username},'%') or cu.gh like concat('%',#{username},'%'))
|
||||||
|
</if>
|
||||||
|
GROUP BY ev.upuserid, cu.dwh
|
||||||
|
) tk left join
|
||||||
( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq
|
( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq
|
||||||
FROM kc_assessuser WHERE 1 = 1
|
FROM kc_assessuser WHERE 1 = 1
|
||||||
<if test="tksf != null and tksf != ''">
|
<if test="tksf != null and tksf != ''">
|
||||||
AND assesscode = #{tksf}
|
AND assesscode = #{tksf}
|
||||||
</if>
|
</if>
|
||||||
GROUP BY usercode, username ) au
|
GROUP BY usercode, username ) au
|
||||||
WHERE tk.upuserid = au.usercode
|
on tk.upuserid = au.usercode
|
||||||
ORDER BY sjtksl DESC
|
ORDER BY sjtksl DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue