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

修改bug

This commit is contained in:
yangjun 2023-09-08 23:19:44 +08:00
parent a36e920d9a
commit b63ea7f15d
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java
View File

@ -264,10 +264,10 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
List<KcEvaluation> exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation);
Map<Integer,String> sourceDictMap = Maps.newHashMap();
//0：门户添加，1：老系统，2：政务大厅，3后台导入
sourceDictMap.put(0,"课程中心");
sourceDictMap.put(1,"老系统");
sourceDictMap.put(2,"服务大厅");
sourceDictMap.put(3,"线下纸质");
// sourceDictMap.put(0,"课程中心");
// sourceDictMap.put(1,"老系统");
// sourceDictMap.put(2,"服务大厅");
// sourceDictMap.put(3,"线下纸质");
//更改字典项
exportList.forEach(x -> {
x.setSourceName(sourceDictMap.get(x.getSource()));

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
View File

@ -98,7 +98,6 @@ public class KcEvaluation implements Serializable {
@ApiModelProperty(value = "数据来源（0：课程中心，1：老系统，2：政务大厅，3：纸质评价）")
private java.lang.Integer source;
@Excel(name = "评价来源", width = 15)
@TableField(exist = false)
private String sourceName;

19
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
View File

@ -267,21 +267,22 @@
</select>
<select id="selectKkdwExportList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
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 (
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
kc_evaluation ev,
kc_ketangbiao kt,
xxhbuser cu
WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
<if test="startTime != null and startTime != ''">
<!-- and ev.up_date &gt;= #{kcEvaluation.startTime}-->
and kt.skrq &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
<!-- and ev.up_date &lt;= #{kcEvaluation.endTime}-->
and kt.skrq &lt;= #{endTime}
</if>
@ -292,17 +293,21 @@
and kkdw = #{kkdw}
</if>
<if test="szdw != null and szdw != ''">
and cu.dwh = #{szdw}
and cu.dwmc = #{szdw}
</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
FROM kc_assessuser WHERE 1 = 1
<if test="tksf != null and tksf != ''">
AND assesscode = #{tksf}
</if>
GROUP BY usercode, username ) au
WHERE tk.upuserid = au.usercode
on tk.upuserid = au.usercode
ORDER BY sjtksl DESC
</select>