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-08-18 19:54:32 +08:00
parent c2fe032021
commit 904379bda2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
View File

@ -83,7 +83,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper("a",kcExportConfigTpkwcqkjzglx, req.getParameterMap());
// queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc()); // queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize); Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
@ -104,6 +104,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
KcTkcstj tkcstj = tjMap.get(x.getGh()); KcTkcstj tkcstj = tjMap.get(x.getGh());
x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0")); x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0")); x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
x.setXqxn(kcXqxnHistory.getTitle());
} }
}); });

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/mapper/xml/XxhbbkjxtkpjGoodLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.kc.grab.log.mapper.XxhbbkjxtkpjGoodLogMapper"> <mapper namespace="org.jeecg.modules.kc.grab.log.mapper.XxhbbkjxtkpjGoodLogMapper">
<select id="selectPage" resultType="org.jeecg.modules.kc.grab.log.entity.XxhbbkjxtkpjBadLog"> <select id="selectPage" resultType="org.jeecg.modules.kc.grab.log.entity.XxhbbkjxtkpjBadLog">
select a.*,b.title as xqxn from xxhbbkjxtkpj_bad_log a select a.*,b.title as xqxn from xxhbbkjxtkpj_good_log a
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +'' LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +''
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>

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

@ -5,7 +5,7 @@
SELECT SELECT
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
FROM ( FROM (
SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwh AS tkdw SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwh AS tkdw,kt.skrq
FROM FROM
kc_evaluation ev, kc_evaluation ev,
kc_ketangbiao kt, kc_ketangbiao kt,
@ -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 FROM SELECT pk.*, au.assess1 as tksf,xnxq.title as xqxn 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.bz,k.skrq,
p.source p.source
FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
WHERE WHERE
@ -69,6 +69,7 @@
</if> </if>
) AS pk ) AS pk
LEFT JOIN kc_assessuser au ON pk.userid = au.usercode LEFT JOIN kc_assessuser au ON pk.userid = au.usercode
LEFT JOIN kc_xqxn_history xnxq on pk.skrq >= xnxq.start_time and pk.skrq &lt;= xnxq.end_time
<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}