diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java index ba57dca..4edeeed 100644 --- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java +++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java @@ -409,16 +409,23 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2 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("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间 - hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT")); //隐患发现部门(隐患责任人部门) +// hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT")); //隐患发现部门(隐患责任人部门) 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("STATE", "100"); //隐患状态 100-安全环保检查暂存的隐患(流程完转0) hidden.put("CREATTIME", time); //发现时间 hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + hidden.put("RECTIFICATIONTYPE", "2"); hidden.put("ISDELETE", "0"); //是否删除(0:有效 1:删除) hidden.put("POSITIONDESC",json.getString("POSITIONDESC")); hidden.put("ISRELEVANT",json.getString("ISRELEVANT")); diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml index 9c9fba0..5cbdbcf 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml @@ -769,6 +769,7 @@ 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 where f.ISDELETE = '0' + and h.ISDELETE = '0'