wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

bug修复:14263,14294

pull/4/head^2
zhangyanli 2024-02-26 16:32:14 +08:00
parent 516f34f769
commit 813c74f097
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
View File

@ -409,16 +409,23 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2 hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2
hidden.put("HIDDENTYPE3", lists.get(2)); //隐患类型3 hidden.put("HIDDENTYPE3", lists.get(2)); //隐患类型3
} }
hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPENAME"));//隐患类型名称 hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));//隐患类型名称
hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度 hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度
hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度
hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间 hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间
hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT")); //隐患发现部门（隐患责任人部门） // hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT")); //隐患发现部门（隐患责任人部门）
hidden.put("CREATOR", json.getString("CREATOR")); //发现人（隐患责任人） hidden.put("CREATOR", json.getString("CREATOR")); //发现人（隐患责任人）
PageData user = new PageData();
user.put("USER_ID",json.getString("CREATOR"));
user = usersMapper.findById(user);
if (user != null) {
hidden.put("HIDDENFINDDEPT", user.getString("DEPARTMENT_ID")); //隐患发现部门（隐患责任人部门）
}
hidden.put("SOURCE", json.getString("SOURCE")); //发现人（隐患责任人） hidden.put("SOURCE", json.getString("SOURCE")); //发现人（隐患责任人）
hidden.put("STATE", "100"); //隐患状态 100-安全环保检查暂存的隐患（流程完转0） hidden.put("STATE", "100"); //隐患状态 100-安全环保检查暂存的隐患（流程完转0）
hidden.put("CREATTIME", time); //发现时间 hidden.put("CREATTIME", time); //发现时间
hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
hidden.put("RECTIFICATIONTYPE", "2");
hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
hidden.put("POSITIONDESC",json.getString("POSITIONDESC")); hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));
hidden.put("ISRELEVANT",json.getString("ISRELEVANT")); hidden.put("ISRELEVANT",json.getString("ISRELEVANT"));

1
src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml
View File

@ -769,6 +769,7 @@
LEFT JOIN sys_dictionaries d ON d.BIANMA = f.INSPECTION_TYPE LEFT JOIN sys_dictionaries d ON d.BIANMA = f.INSPECTION_TYPE
LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_SITUATION biss on biss.INSPECTION_ID = f.INSPECTION_ID LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_SITUATION biss on biss.INSPECTION_ID = f.INSPECTION_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
and h.ISDELETE = '0'
<!-- <if test="pd.supDeparIds != null and pd.supDeparIds != '' and pd.supDeparIds !='ALL' and pd.supDeparIds !='NOT'">--> <!-- <if test="pd.supDeparIds != null and pd.supDeparIds != '' and pd.supDeparIds !='ALL' and pd.supDeparIds !='NOT'">-->
<!-- and (f.INSPECTED_DEPARTMENT_ID in (${pd.supDeparIds}) )--> <!-- and (f.INSPECTED_DEPARTMENT_ID in (${pd.supDeparIds}) )-->
<!-- </if>--> <!-- </if>-->