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

Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

0927cmt
songwenxuan 2024-04-25 14:42:41 +08:00
parent 46a8b6fef4 c43396f7fd
commit 35271c8324
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java
View File

@ -866,7 +866,19 @@ public class HiddenApiController extends BaseController {
} }
pd.put("departmentIds",departmentIds); pd.put("departmentIds",departmentIds);
} }
// 增加隐患整改部门查询 结束 // 增加发现整改部门查询 开始
if(StringUtils.isNotBlank(pd.getString("creatorUserDept"))){
String url ="department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url);
List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("creatorUserDept"));
for(Department department:departments){
departmentIds.add(department.getDEPARTMENT_ID());
}
pd.put("creatorUserDepts",departmentIds);
}
// 增加隐患发现部门查询 结束
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if (!Jurisdiction.getIS_MAIN().equals("1")) { //主账号 if (!Jurisdiction.getIS_MAIN().equals("1")) { //主账号
pd.put("queryUserId", Jurisdiction.getUSER_ID()); pd.put("queryUserId", Jurisdiction.getUSER_ID());

12
src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java
View File

@ -919,14 +919,14 @@ public class HiddenServiceImpl implements HiddenService{
int ajbHjZg = Integer.parseInt(map.get("zcbGscZg").toString())+Integer.parseInt(map.get("xcbGscZg").toString())+Integer.parseInt(map.get("bzbGscZg").toString()); int ajbHjZg = Integer.parseInt(map.get("zcbGscZg").toString())+Integer.parseInt(map.get("xcbGscZg").toString())+Integer.parseInt(map.get("bzbGscZg").toString());
map.put("ajbHjZs","本月共检查出安全隐患"+ajbHjZs+"项，已完成整改"+ajbHjZg+"项"); map.put("ajbHjZs","本月共检查出安全隐患"+ajbHjZs+"项，已完成整改"+ajbHjZg+"项");
//装船 //装船
map.put("ajbZcbGsc","装船部公司检查"+map.get("zcbGscZs").toString()+"项"); map.put("ajbZcbGsc","装船部公司检查"+map.get("zcbGscZs").toString()+"项，已完成"+map.get("zcbGscZg").toString()+"项");
map.put("ajbZcbZc","自查"+map.get("zcbZcZs").toString()+"项"); map.put("ajbZcbZc","自查"+map.get("zcbZcZs").toString()+"项，已完成"+map.get("zcbZcZg").toString()+"项");
//卸车 //卸车
map.put("ajbXcbGsc","卸车部公司检查"+map.get("xcbGscZs").toString()+"项"); map.put("ajbXcbGsc","卸车部公司检查"+map.get("xcbGscZs").toString()+"项，已完成"+map.get("xcbGscZg").toString()+"项");
map.put("ajbXcbZc","自查"+map.get("xcbZcZs").toString()+"项"); map.put("ajbXcbZc","自查"+map.get("xcbZcZs").toString()+"项，已完成"+map.get("xcbZcZg").toString()+"项");
//保障 //保障
map.put("ajbBzbGsc","保障部公司检查"+map.get("bzbGscZs").toString()+"项"); map.put("ajbBzbGsc","保障部公司检查"+map.get("bzbGscZs").toString()+"项，已完成"+map.get("bzbGscZg").toString()+"项");
map.put("ajbBzbZc","自查"+map.get("bzbZcZs").toString()+"项"); map.put("ajbBzbZc","自查"+map.get("bzbZcZs").toString()+"项，已完成"+map.get("bzbZcZg").toString()+"项");
return map; return map;
} }
} }

6
src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
View File

@ -408,7 +408,11 @@
<if test="pd.creatorUserDept != null and pd.creatorUserDept != ''"><!-- 隐患发现人 部门--> <if test="pd.creatorUserDept != null and pd.creatorUserDept != ''"><!-- 隐患发现人 部门-->
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER
hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
where user.DEPARTMENT_ID = #{pd.creatorUserDept} ) where user.DEPARTMENT_ID in
<foreach item="item" index="index" collection="pd.creatorUserDepts" open="(" separator="," close=")">
#{pd.creatorUserDepts[${index}]}
</foreach>
)
</if> </if>
<if test="pd.creatorName != null and pd.creatorName != ''"><!-- 隐患发现人 --> <if test="pd.creatorName != null and pd.creatorName != ''"><!-- 隐患发现人 -->
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID