提交代码

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -87,6 +87,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             leftJoin = "z_engineering_industry"; // 工业工程
             szAndGy = "sz";
         }
+        else if ("6".equals(type)){
+            leftJoin = "z_engineering_air_wall"; // 工业工程
+        }
         LinkedList<String> list = zEngineeringCivilMapper.getTableNames("z_engineering_info");
         List DateList = new ArrayList();
         list.removeLast();
@@ -208,6 +211,20 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             });
             MonthTableNameHandler.removeData();
         }
+        else if ("6".equals(type)){ // 工业工程
+            byUserList.forEach(item -> {
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+;
+                MonthTableNameHandler.setData(date);
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    ite.put("reviewStatus", str);
+                });
+                item.put("status",mapList);
+            });
+            MonthTableNameHandler.removeData();
+        }
         return byUserList;
     }