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

禅道不过修复

This commit is contained in:
马三炮 2025-07-04 15:07:39 +08:00
parent d1f18db2a2
commit 51d2021663
3 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,8 +516,9 @@
SELECT lcp.cons_persion_id AS value,
pcp.cons_name AS label
FROM lk_cont_person lcp
LEFT JOIN pt_cons_person pcp ON lcp.cons_persion_id = pcp.cons_user_id AND pcp.is_active = 1
LEFT JOIN pt_cons_person pcp ON lcp.cons_persion_id = pcp.cons_user_id
WHERE lcp.cont_uuid = #{supUuid} AND lcp.into_status = 3 AND lcp.out_status != 3 AND lcp.pro_id = #{proId}
AND pcp.is_active = 1
</select>
<select id="getReviewOfDeferredApprovalList"
resultType="com.bonus.common.safetycheck.PitfallDelayApprovalVo">

14
bonus-modules/bonus-project/src/main/resources/mapper/system/ProjectMapper.xml
View File

@ -119,7 +119,9 @@
sup_unit_name = #{supervisorUnit},
create_user = #{createPerson},
create_id = #{createPersonId},
<if test="supervisorUnitUserId != null and supervisorUnitUserId != ''">
sup_user_id = #{supervisorUnitUserId},
</if>
sup_user_name = #{supervisorUnitUser}
where pro_id = #{proId}
</update>
@ -355,26 +357,26 @@
count(1)
from lk_cont_person lcp
left join pt_cons_person pcp on lcp.cons_persion_id = pcp.cons_user_id
where pro_id = #{proId} and into_status = '2' and out_status != '2' and pcp.is_active = '1'
where pro_id = #{proId} and into_status = '3' and out_status = '0' and pcp.is_active = '1'
</select>
<select id="getSpecialJobsNum" resultType="java.lang.String">
select
count(1)
from lk_cont_person lcp
left join pt_cons_person pcp on lcp.cons_persion_id = pcp.cons_user_id
where pro_id = #{proId} and into_status = '2' and out_status != '2' and pcp.work_type is not null
where pro_id = #{proId} and into_status = '3' and out_status = '0' and pcp.work_type is not null
</select>
<select id="getEquipmentNum" resultType="java.lang.String">
select
count(1)
sum(tools_num)
from pt_pro_tools
where pro_id = #{proId} and is_active = '1'
where pro_id = #{proId} and is_active = '1' AND STATUS = '3'
</select>
<select id="getSpecialEquipmentNum" resultType="java.lang.String">
select
count(1)
sum(tools_num)
from pt_pro_tools
where pro_id = #{proId} and is_active = '1' and tools_type = '2'
where pro_id = #{proId} and is_active = '1' and tools_type = '2' AND STATUS = '3'
</select>
<select id="getSupervisorNum" resultType="java.lang.String">
select

51
bonus-modules/bonus-project/src/main/resources/mapper/system/SnapshotMapper.xml
View File

@ -40,47 +40,48 @@
</delete>
<select id="getMySnapshotList" resultType="com.bonus.common.safetycheck.SnapshotBean">
select
id as snapshotId,
pro_id as proId,
pro_name as proName,
description,
if(status = '1', '已保存', if(status = '2', '已转违章', if(status = '3', '已转隐患', ''))) as status,
if(into_status = '1', '待审批', if(into_status = '2', '已通过', if(into_status = '3', '未通过', ''))) as intoStatus,
create_time as createTime,
update_time as updateTime,
create_user_id as createUserId,
create_user_name as createUserName,
phone,
dept_id as deptId,
dept_name as deptName,
post_id as postId,
post_name as postName,
shooting_location as shootingLocation
from st_snapshot
ss.id as snapshotId,
ss.pro_id as proId,
ss.pro_name as proName,
ss.description,
if(ss.status = '1', '已保存', if(ss.status = '2', '已转违章', if(ss.status = '3', '已转隐患', ''))) as status,
if(ss.into_status = '1', '待审批', if(ss.into_status = '2', '已通过', if(ss.into_status = '3', '未通过', ''))) as intoStatus,
ss.create_time as createTime,
ss.update_time as updateTime,
ss.create_user_id as createUserId,
su.nick_name as createUserName,
ss.phone,
ss.dept_id as deptId,
ss.dept_name as deptName,
ss.post_id as postId,
ss.post_name as postName,
ss.shooting_location as shootingLocation
from st_snapshot ss
left join sys_user su on ss.create_user_id = su.user_id
where is_active = '1'
<if test="type != null and type != ''">
and status = #{type}
and ss.status = #{type}
</if>
<if test="userId != null and userId != ''">
and create_user_id = #{userId}
and ss.create_user_id = #{userId}
</if>
<if test="proName != null and proName != ''">
and pro_name like concat('%', #{proName}, '%')
and ss.pro_name like concat('%', #{proName}, '%')
</if>
<if test="startTime != null and startTime != ''">
and DATE_FORMAT(create_time, '%Y-%m-%d') between #{startTime} and #{endTime}
and DATE_FORMAT(ss.create_time, '%Y-%m-%d') between #{startTime} and #{endTime}
</if>
<if test="status != null and status != ''">
and status = #{status}
and ss.status = #{status}
</if>
<if test="intoStatus != null and intoStatus != ''">
and into_status = #{intoStatus}
and ss.into_status = #{intoStatus}
</if>
<if test="phone != null and phone != ''">
and phone like concat('%', #{phone}, '%')
and ss.phone like concat('%', #{phone}, '%')
</if>
<if test="userName != null and userName != ''">
and create_user_name like concat('%', #{userName}, '%')
and ss.create_user_name like concat('%', #{userName}, '%')
</if>
</select>
<select id="getSnapshotList" resultType="com.bonus.common.safetycheck.SnapshotBean">