diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java index 1fc8812..5ba2333 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java @@ -310,7 +310,9 @@ public class SystemUserAuthController { .eq(InspectRecord::getState, 3).eq(InspectRecord::getLevel, 1)); for (InspectRecord inspectRecord : list) { Map map = new HashMap<>(); + map.put("flag", 1); map.put("type", "质量管理初审"); + map.put("state", inspectRecord.getSlippageState()); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map); @@ -323,7 +325,9 @@ public class SystemUserAuthController { .eq(InspectRecord::getState, 3).eq(InspectRecord::getLevel, 2)); for (InspectRecord inspectRecord : list) { Map map = new HashMap<>(); + map.put("flag", 1); map.put("type", "质量管理终审"); + map.put("state", inspectRecord.getSlippageState()); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map); @@ -336,7 +340,10 @@ public class SystemUserAuthController { .eq(InspectRecord::getState, 2)); for (InspectRecord inspectRecord : list) { Map map = new HashMap<>(); + map.put("projectSn", inspectRecord.getEngineeringSn()); + map.put("flag", 1); map.put("type", "质量问题整改"); + map.put("state", inspectRecord.getSlippageState()); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map); @@ -349,7 +356,10 @@ public class SystemUserAuthController { .eq(InspectRecord::getState, 3).eq(InspectRecord::getLevel, 1)); for (InspectRecord inspectRecord : list) { Map map = new HashMap<>(); + map.put("projectSn", inspectRecord.getEngineeringSn()); + map.put("flag", 2); map.put("type", "安全管理初审"); + map.put("state", inspectRecord.getSlippageState()); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map); @@ -362,7 +372,10 @@ public class SystemUserAuthController { .eq(InspectRecord::getState, 3).eq(InspectRecord::getLevel, 2)); for (InspectRecord inspectRecord : list) { Map map = new HashMap<>(); + map.put("projectSn", inspectRecord.getEngineeringSn()); + map.put("flag", 2); map.put("type", "安全管理终审"); + map.put("state", inspectRecord.getSlippageState()); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map); @@ -375,7 +388,10 @@ public class SystemUserAuthController { .eq(InspectRecord::getState, 2)); for (InspectRecord inspectRecord : list) { Map map = new HashMap<>(); + map.put("projectSn", inspectRecord.getEngineeringSn()); + map.put("flag", 2); map.put("type", "安全问题整改"); + map.put("state", inspectRecord.getSlippageState()); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map); @@ -386,7 +402,10 @@ public class SystemUserAuthController { List list = projectSubItemService.list(Wrappers.lambdaQuery().eq(ProjectSubItem::getApprovalStatus, 0)); for (ProjectSubItem projectSubItem : list) { Map map = new HashMap<>(); + map.put("projectSn", projectSubItem.getEngineeringSn()); + map.put("flag", 3); map.put("type", "施工节点审批"); + map.put("state", 1); map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(projectSubItem.getEngineeringSn())) .collect(Collectors.toList()).get(0).getEngineeringName()); listMap.add(map);