liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
马三炮 2025-06-20 09:09:52 +08:00
parent dfc891ce42
commit ad660eac9c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml
View File

@ -339,7 +339,7 @@
ypi.check_level_id AS checkLevel, ypi.check_level_id AS checkLevel,
ypi.check_level_name AS checkLevelName, ypi.check_level_name AS checkLevelName,
ypi.check_type AS checkType, ypi.check_type AS checkType,
ypi.check_type_name AS checkTypeName, sdd.dict_label AS checkTypeName,
ypi.create_user_id AS createUserId, ypi.create_user_id AS createUserId,
ypi.create_user_name AS createUserName, ypi.create_user_name AS createUserName,
ypi.create_time AS createTime, ypi.create_time AS createTime,
@ -384,6 +384,8 @@
LEFT JOIN yh_pitfall_detaills ypd on ypi.pitfall_id = ypd.pitfall_id LEFT JOIN yh_pitfall_detaills ypd on ypi.pitfall_id = ypd.pitfall_id
LEFT JOIN sys_dict_data sdd2 LEFT JOIN sys_dict_data sdd2
ON ypi.check_status = sdd2.dict_value AND sdd2.dict_type = 'yn_check_status' AND sdd2.status = 0 ON ypi.check_status = sdd2.dict_value AND sdd2.dict_type = 'yn_check_status' AND sdd2.status = 0
LEFT JOIN sys_dict_data sdd
ON ypi.check_type = sdd.dict_value AND sdd.dict_type = 'yh_check_type' AND sdd.status = 0
WHERE ypi.is_active = 1 WHERE ypi.is_active = 1
AND ypi.pitfall_id = #{id} AND ypi.pitfall_id = #{id}
</select> </select>

2
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml
View File

@ -335,9 +335,11 @@
wvi.task_id as taskId, wvi.task_id as taskId,
wvi.proc_inst_id as procInsId, wvi.proc_inst_id as procInsId,
wvd.money as money, wvd.money as money,
ppi.pro_type as type,
ifnull(wvi.reject_reason,'') as rejectReason ifnull(wvi.reject_reason,'') as rejectReason
from wz_violation_info wvi from wz_violation_info wvi
left join wz_violation_details wvd on wvi.violation_id = wvd.violation_id and wvd.is_active = '1' left join wz_violation_details wvd on wvi.violation_id = wvd.violation_id and wvd.is_active = '1'
left join pt_project_info ppi on wvi.pro_id = ppi.pro_id
where wvi.is_active = '1' and wvi.is_ticket = '1' where wvi.is_active = '1' and wvi.is_ticket = '1'
<if test="proId != null and proId != ''"> <if test="proId != null and proId != ''">
and wvi.pro_id = #{proId} and wvi.pro_id = #{proId}

2
bonus-modules/bonus-project/src/main/resources/mapper/system/ImportMapper.xml
View File

@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
psp.phone as phone psp.phone as phone
from lk_sup_person lsp from lk_sup_person lsp
left join pt_sup_person psp on psp.sup_user_id = lsp.sup_persion_id and psp.is_active = '1' left join pt_sup_person psp on psp.sup_user_id = lsp.sup_persion_id and psp.is_active = '1'
where lsp.pro_id = #{proId} and pcp.sup_user_id is not null where lsp.pro_id = #{proId} and lsp.sup_persion_id is not null
</if> </if>
</select> </select>
<select id="getPersonListByImportUuid" resultType="com.bonus.project.domain.SubPerson"> <select id="getPersonListByImportUuid" resultType="com.bonus.project.domain.SubPerson">