guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修改动火作业数据延时监火审核人显示

main
limingyu 2023-12-19 18:00:49 +08:00
parent e29300756e
commit 990ea8814d
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
View File

@ -827,11 +827,16 @@ public class AppHotWorkApplicationController extends BaseController {
return map; return map;
} }
} else { } else {
hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们 //先判断延时监火是否为选择部门
hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们（选择部门）
if (hotUserList.size() < 1) { if (hotUserList.size() < 1) {
map.put("result", "error"); //如果查询部门查不到就根据人查询
map.put("msg", "获取审批人意见失败！请联系管理员"); hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人（选择人）
return map; if (hotUserList.size() != 1) {
map.put("result", "error");
map.put("msg", "获取审批人意见失败！请联系管理员");
return map;
}
} }
} }

12
src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
View File

@ -134,21 +134,23 @@
<select id="listAll" parameterType="pd" resultType="pd"> <select id="listAll" parameterType="pd" resultType="pd">
select select
<include refid="Field"></include> <include refid="Field"></include>
,dept.NAME as deptName ,if(dept.NAME is null,dept1.NAME,dept.NAME) as deptName
,u.NAME as userName ,u.NAME as userName
,su.USERNAME as userName2 ,su.USERNAME as userName2
, u.USERNAME as userPhone , u.USERNAME as userPhone
,dept.DEPARTMENT_ID DEPARTMENT_ID ,if(dept.DEPARTMENT_ID is null,dept1.DEPARTMENT_ID,dept.DEPARTMENT_ID) as DEPARTMENT_ID
,su.USER_TYPE USER_TYPE ,su.USER_TYPE USER_TYPE
,reuser.NAME as REGULATORY_USER_NAME ,reuser.NAME as REGULATORY_USER_NAME
,redept.NAME as REGULATORY_DEPT_NAME ,if(redept.NAME is null,redept1.NAME,redept.NAME) as REGULATORY_DEPT_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join SYS_USER u on u.USER_ID = f.USER_ID left join SYS_USER u on u.USER_ID = f.USER_ID
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
left join oa_department dept1 on dept1.DEPARTMENT_ID = f.USER_ID
left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept1 on redept1.DEPARTMENT_ID = f.USER_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 --> <if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
and(f.FOREIGN_KEY in and(f.FOREIGN_KEY in
@ -216,7 +218,7 @@
f.OPERATTIME, f.OPERATTIME,
s.NAME, s.NAME,
f.TYPE, f.TYPE,
u.NAME as USER_NAME, if(u.NAME is null,od.NAME,u.NAME) as USER_NAME,
su.USERNAME as SPECIAL_USER_NAME, su.USERNAME as SPECIAL_USER_NAME,
reuser.NAME as REGULATORY_USER_NAME reuser.NAME as REGULATORY_USER_NAME
FROM FROM
@ -225,6 +227,8 @@
left join SYS_USER u on u.USER_ID = f.USER_ID left join SYS_USER u on u.USER_ID = f.USER_ID
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join oa_department od on od.DEPARTMENT_ID = f.USER_ID
left join `qa-gwj-regulatory`.SYS_DEPARTMENT rd on rd.DEPARTMENT_ID = f.USER_ID
WHERE WHERE
f.FOREIGN_KEY = #{FOREIGN_KEY} f.FOREIGN_KEY = #{FOREIGN_KEY}
AND f.ISDELETE = '0' AND f.ISDELETE = '0'