diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java index d9d3ac6..ae13682 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java @@ -35,9 +35,12 @@ public class SafetyEnvironmentalInspectionPageQry extends PageQuery { private String projectName; private String inspectionUserName; private List statusList; + private List noStatusList; private Integer status; private String year; private String menuPath; + private Long corpinfoId; + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index c8a61d0..d6e262c 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -21,7 +21,7 @@ left join user hfu on hfu.id = hf.find_user_id left join department hfd on hfd.id = hfu.department_id left join user au on au.id = h.accept_user_id - left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status = 3 and h.source in (2, 3) + left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status in (3,5) and h.source in (2, 3) left join key_project kp on kp.key_project_id = i.key_project_id left join ai_alarm aa on h.foreign_key = aa.ai_alarm_id and h.source = 1 left join key_project kp2 on kp2.key_project_id = aa.key_project_id diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 2c97a17..d0e23c6 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -171,7 +171,7 @@ - AND kp.corpinfo_id = #{params.corpinfoId} + AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId} @@ -204,28 +204,29 @@