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-12-27 08:21:39 +08:00
parent 713bf1c67b
commit 29154c3901
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.kc.kcZzThpjb.mapper.KcZzThpjbMapper">
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzThpjb.entity.KcZzThpjb">
select a.*,b.title as xqxn from kc_zz_thpjb a
select distinct a.*,b.title as xqxn from kc_zz_thpjb a
LEFT JOIN kc_xqxn_history b on a.sksj >= b.start_time + '' and a.sksj &lt;= b.end_time +''
left join xxhbuser c on a.pkjsbh = c.gh
left join xxhbuser d on d.dwh = c.dwh

12
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
View File

@ -228,13 +228,15 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper4 = new QueryWrapper<>();
kcEvaluationansQueryWrapper4.eq("queid","14");
kcEvaluationansQueryWrapper4.eq("ordernum",ans4);
kcEvaluationansQueryWrapper4.in("ordernum",ans4.split(","));
List<KcEvaluationans> kcEvaluationansList4 = kcEvaluationansService.list(kcEvaluationansQueryWrapper4);
if(kcEvaluationansList4!=null && kcEvaluationansList4.size()>0){
kcEvaluations.setId(null);
kcEvaluations.setQueid(kcEvaluationansList4.get(0).getQueid());
kcEvaluations.setAnsid(kcEvaluationansList4.get(0).getId());
kcEvaluationsService.save(kcEvaluations);
for(KcEvaluationans KcEvaluationans:kcEvaluationansList4){
kcEvaluations.setId(null);
kcEvaluations.setQueid(KcEvaluationans.getQueid());
kcEvaluations.setAnsid(KcEvaluationans.getId());
kcEvaluationsService.save(kcEvaluations);
}
}
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper5 = new QueryWrapper<>();

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.kc.kcZzXstkb.mapper.KcZzXstkbMapper">
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzXstkb.entity.KcZzXstkb">
select a.*,b.title as xqxn from kc_zz_xstkb a
select distinct a.*,b.title as xqxn from kc_zz_xstkb a
LEFT JOIN kc_xqxn_history b on a.sksj >= b.start_time + '' and a.sksj &lt;= b.end_time +''
left join xxhbuser c on a.tkjsgh = c.gh
left join xxhbuser d on d.dwh = c.dwh

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.kc.kcZzYbtkb.mapper.KcZzYbtkbMapper">
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzYbtkb.entity.KcZzYbtkb">
select a.*,b.title as xqxn from kc_zz_ybtkb a
select distinct a.*,b.title as xqxn from kc_zz_ybtkb a
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +''
left join xxhbuser c on a.tkjsbh = c.gh
left join xxhbuser d on d.dwh = c.dwh

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

@ -75,8 +75,18 @@
and (c.xm like concat('%',#{kcEvaluation.username},'%') or c.gh like concat('%',#{kcEvaluation.username},'%'))
</if>
) AS pk
LEFT JOIN (SELECT gh as usercode,xm as username, zwmc as assess1
FROM kc_tksfrzb
LEFT JOIN (
<!-- SELECT gh as usercode,xm as username, zwmc as assess1-->
<!-- FROM kc_tksfrzb-->
select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,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'
and a.xqxn = (select flag1 from kc_sys_config where id = 1)
<!-- <if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">-->
<!-- AND b.item_value = #{kcEvaluation.tksf}-->
<!-- </if>-->
GROUP BY gh,xm
) 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
left join kc_kechengbiao kcb on pk.kechengbiaoid = kcb.id