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

修改bug

This commit is contained in:
yangjun 2024-03-30 08:35:04 +08:00
parent fde032f491
commit 94ace3d13e
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml
View File

@ -82,6 +82,9 @@
<if test='kcExportConfigTpkwcqkjzglx.type != null and kcExportConfigTpkwcqkjzglx.type == "2"'> <if test='kcExportConfigTpkwcqkjzglx.type != null and kcExportConfigTpkwcqkjzglx.type == "2"'>
and ytkcs -0 > sjtkcs - 0 and ytkcs -0 > sjtkcs - 0
</if> </if>
<if test='kcExportConfigTpkwcqkjzglx.xm != null and kcExportConfigTpkwcqkjzglx.xm != ""'>
and xm like concat('%',#{kcExportConfigTpkwcqkjzglx.xm} ,'%')
</if>
</where> </where>
</select> </select>
@ -102,8 +105,8 @@
SELECT SELECT
kc.dwjc as dwmc, kc.dwjc as dwmc,
total.total_sum, total.total_sum,
ready.ready_sum, ifnull(ready.ready_sum,'0') as ready_sum,
round(ready.ready_sum / total.total_sum,2) as ytkcs round( ifnull(ready.ready_sum,'0') / total.total_sum, 2 ) AS ytkcs
FROM FROM
( (
SELECT SELECT
@ -155,7 +158,7 @@
count( 'x' ) AS pj_sum count( 'x' ) AS pj_sum
FROM FROM
kc_evaluation a, kc_evaluation a,
( select bxqkssj as start_time , bxqkssj as end_time FROM kc_xqxn_history WHERE id = '1') b, ( SELECT bxqkssj AS start_time, bxqjssj AS end_time FROM kc_sys_config WHERE id = '1') b,
( (
SELECT SELECT
xqxn, xqxn,

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

@ -310,11 +310,10 @@
FROM ( FROM (
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 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
left join kc_ketangbiao kt on ev.minkcid = kt.id left join kc_ketangbiao kt on ev.minkcid = kt.id
left join xxhbuser cu on ev.upuserid = cu.gh left join xxhbuser cu on ev.upuserid = cu.gh
left join kc_kechengbiao kcb on pk.kechengbiaoid = kcb.id
WHERE 1=1 WHERE 1=1
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
<!-- and ev.up_date &gt;= #{kcEvaluation.startTime}--> <!-- and ev.up_date &gt;= #{kcEvaluation.startTime}-->
@ -351,8 +350,8 @@
( select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,round(max(ytkcs-0),0) as tkyq from kc_export_config_tpkwcqkjzglx a ( select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,round(max(ytkcs-0),0) as tkyq from kc_export_config_tpkwcqkjzglx a
LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705' LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
and a.xqxn = (select flag1 from kc_sys_config where id = 1) and a.xqxn = (select flag1 from kc_sys_config where id = 1)
<if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''"> <if test="tksf != null and tksf != ''">
AND b.item_value = #{kcEvaluation.tksf} AND b.item_value = #{tksf}
</if> </if>
GROUP BY gh,xm) au GROUP BY gh,xm) au
on tk.upuserid = au.usercode on tk.upuserid = au.usercode

2
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
View File

@ -145,7 +145,7 @@ spring:
# driver-class-name: oracle.jdbc.OracleDriver # driver-class-name: oracle.jdbc.OracleDriver
#redis 配置 #redis 配置
redis: redis:
database: 1 database: 2
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password: '' password: ''