修改导出

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringCivilExportVos.java

@@ -91,7 +91,13 @@ public class ZEngineeringCivilExportVos extends BaseEntity implements Serializab
     private String gx6;
     private String gx7;
 
-    private String nickName;
+    private String nickNameA;
+    private String nickNameB;
+    private String nickNameC;
+    private String nickNameD;
+    private String nickNameE;
+    private String nickNameF;
+    private String nickNameG;
     private String phonenumber;
 
 

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

@@ -87,7 +87,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LocalDate startDate = LocalDate.of(2024, 3, 1); // 指定开始日期
         LocalDate endDate = LocalDate.now(); // 当前日期
         List<String> monthsBetween = getMonthsBetween(startDate, endDate);
-        return baseMapper.exportObtainQualifiedRoom(bo,monthsBetween);
+        return baseMapper.exportObtainQualifiedRoom(bo, monthsBetween);
     }
 
     @Override
@@ -95,7 +95,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LocalDate startDate = LocalDate.of(2024, 3, 1); // 指定开始日期
         LocalDate endDate = LocalDate.now(); // 当前日期
         List<String> monthsBetween = getMonthsBetween(startDate, endDate);
-        return baseMapper.exportBottomLeg(bo,monthsBetween);
+        return baseMapper.exportBottomLeg(bo, monthsBetween);
     }
 
     @Override
@@ -145,8 +145,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         zEngineeringCivilVo.setAllPicUrl(izEngineeringNodeService.queryPhotoList(zEngineeringNodeBo));
         return zEngineeringCivilVo;
     }
+
     @Override
-    public ZEngineeringCivilVo lowerStaging(String areaId,String buildingId,String unitId, String direction ,String number) {
+    public ZEngineeringCivilVo lowerStaging(String areaId, String buildingId, String unitId, String direction, String number) {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(areaId), ZEngineeringCivil::getAreaId, areaId);
         if (StringUtils.isEmpty(buildingId)) {
@@ -161,9 +162,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         }
         lqw.eq(ZEngineeringCivil::getEnginCycle, "0");
         lqw.eq(ZEngineeringCivil::getEnginType, "old_renovation");
-        lqw.eq(ZEngineeringCivil::getEnginClassification,"bottom_leg");
+        lqw.eq(ZEngineeringCivil::getEnginClassification, "bottom_leg");
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
-        if(!ObjectUtils.isEmpty(zEngineeringCivilVo)){
+        if (!ObjectUtils.isEmpty(zEngineeringCivilVo)) {
             ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
             zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
             zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
@@ -173,13 +174,13 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             Iterator<ZEngineeringInfoBo> iterator = retNodeBo.getzEngineeringInfoBoList().iterator();
             while (iterator.hasNext()) {
                 ZEngineeringInfoBo info = iterator.next();
-                if(!direction.equals(info.getConstructAddre())||!number.equals(String.valueOf(info.getzEngineeringMaterialBo().get(0).getNumber().intValue()))){
+                if (!direction.equals(info.getConstructAddre()) || !number.equals(String.valueOf(info.getzEngineeringMaterialBo().get(0).getNumber().intValue()))) {
                     iterator.remove();
                 }
             }
-            if(!ObjectUtils.isEmpty(retNodeBo.getzEngineeringInfoBoList())){
+            if (!ObjectUtils.isEmpty(retNodeBo.getzEngineeringInfoBoList())) {
                 zEngineeringCivilVo.setzEngineeringNodeBo(retNodeBo);
-            }else{
+            } else {
                 zEngineeringCivilVo.setzEngineeringNodeBo(null);
             }
 
@@ -241,16 +242,16 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @Override
     public TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery) {
         Page<ZBuildingBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-//        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
-//        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
-//        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
-//        lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
-//        lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-//        lqw.notIn(!ObjectUtils.isEmpty(bo.getNotAreaId()), ZEngineeringCivil::getAreaId, bo.getNotAreaId());
-//        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-//        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
-//        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
-//        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
+        //        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        //        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
+        //        lqw.notIn(!ObjectUtils.isEmpty(bo.getNotAreaId()), ZEngineeringCivil::getAreaId, bo.getNotAreaId());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
+        //        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
         Page<ZEngineeringCivilVo> result = new Page<>();
         if (!"".equals(bo.getType()) && !ObjectUtils.isEmpty(bo.getType())) {
             List IDList = zEngineeringNodeService.nodeTypeList(baseMapper.selectIdByParams(bo), bo.getType(), bo.getCompletionStatus(), bo);
@@ -334,7 +335,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             if (a.size() == 0) {
                 return result;
             }
-            result = baseMapper.queryPageIdList(a, Long.parseLong(String.valueOf(a.size())), null,null,null).getRecords();
+            result = baseMapper.queryPageIdList(a, Long.parseLong(String.valueOf(a.size())), null, null, null).getRecords();
             Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result);
             result.forEach(item -> {
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
@@ -345,13 +346,13 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result);
         result.forEach(item -> {
             item.setNodeReViewStateList(ReviewList.get(item.getId()));
-            item.setGx1(((List<Map<String,String>>) item.getNodeReViewStateList()).get(0).get("state"));
-            item.setGx2(((List<Map<String,String>>) item.getNodeReViewStateList()).get(1).get("state"));
-            item.setGx3(((List<Map<String,String>>) item.getNodeReViewStateList()).get(2).get("state"));
-            item.setGx4(((List<Map<String,String>>) item.getNodeReViewStateList()).get(3).get("state"));
-            item.setGx5(((List<Map<String,String>>) item.getNodeReViewStateList()).get(4).get("state"));
-            item.setGx6(((List<Map<String,String>>) item.getNodeReViewStateList()).get(5).get("state"));
-            item.setGx7(((List<Map<String,String>>) item.getNodeReViewStateList()).get(6).get("state"));
+            item.setGx1(((List<Map<String, String>>) item.getNodeReViewStateList()).get(0).get("state"));
+            item.setGx2(((List<Map<String, String>>) item.getNodeReViewStateList()).get(1).get("state"));
+            item.setGx3(((List<Map<String, String>>) item.getNodeReViewStateList()).get(2).get("state"));
+            item.setGx4(((List<Map<String, String>>) item.getNodeReViewStateList()).get(3).get("state"));
+            item.setGx5(((List<Map<String, String>>) item.getNodeReViewStateList()).get(4).get("state"));
+            item.setGx6(((List<Map<String, String>>) item.getNodeReViewStateList()).get(5).get("state"));
+            item.setGx7(((List<Map<String, String>>) item.getNodeReViewStateList()).get(6).get("state"));
         });
 
         return result;
@@ -400,65 +401,79 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getCorrosionLevel())) {
                     zEngineeringCivilExportVos.setCorrosionLevel("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel())
-                    && "拆旧管".equals(zEngineeringCivilExportVo.getType())
-                    && zEngineeringCivilExportVo.getCorrosionLevel() != null
-                    && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
-                else if ("拆旧管".equals(zEngineeringCivilExportVo.getType())
-                    && zEngineeringCivilExportVo.getCorrosionLevel() != null
-                    && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                    zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                } else if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
-                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                    zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                }
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
-                else if ("打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                    zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                } else if ("打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
+                    zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                }
                 if ("立杠".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setLGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setLGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     zEngineeringCivilExportVos.setLGnumber(zEngineeringCivilExportVo.getNumber().toString());
-                    zEngineeringCivilExportVos.setNickName(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setNickNameB(zEngineeringCivilExportVo.getNickName().toString());
                     zEngineeringCivilExportVos.setPhonenumber(zEngineeringCivilExportVo.getPhonenumber().toString());
                 }
-                if ("挂表".equals(zEngineeringCivilExportVo.getType()))
+                if ("挂表".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBrand(zEngineeringCivilExportVo.getBrand());
+                    zEngineeringCivilExportVos.setNickNameC(zEngineeringCivilExportVo.getNickName().toString());
+                }
                 if ("表后管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBHGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setBHGspecifications(zEngineeringCivilExportVo.getSpecifications());
-                    zEngineeringCivilExportVos.setBHGnumber(ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber())?"":zEngineeringCivilExportVo.getNumber().toString());
+                    zEngineeringCivilExportVos.setNickNameD(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setBHGnumber(ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber()) ? "" : zEngineeringCivilExportVo.getNumber().toString());
                 }
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getBJQmaterialQuality())) {
                     zEngineeringCivilExportVos.setBJQmaterialQuality("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getBJQmaterialQuality()) && "报警器".equals(zEngineeringCivilExportVo.getType()))
+                if ("".equals(zEngineeringCivilExportVos.getBJQmaterialQuality()) && "报警器".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getBrand());
-                else if ("报警器".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setNickNameE(zEngineeringCivilExportVo.getNickName().toString());
+                } else if ("报警器".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVos.getBJQmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
-                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
+
+                    zEngineeringCivilExportVos.setNickNameE(zEngineeringCivilExportVo.getNickName().toString());
+                }if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality()) && "切断阀".equals(zEngineeringCivilExportVo.getType()))
+                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality()) && "切断阀".equals(zEngineeringCivilExportVo.getType())){
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getBrand());
-                else if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
+
+                    zEngineeringCivilExportVos.setNickNameF(zEngineeringCivilExportVo.getNickName().toString());}
+                else if ("切断阀".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
-                if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
+
+                    zEngineeringCivilExportVos.setNickNameF(zEngineeringCivilExportVo.getNickName().toString());
+                }if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setVisitType(zEngineeringCivilExportVo.getVisitType());
                     zEngineeringCivilExportVos.setFGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+
+                    zEngineeringCivilExportVos.setNickNameG(zEngineeringCivilExportVo.getNickName().toString());
                     zEngineeringCivilExportVos.setFGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     if (!ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber()))
                         zEngineeringCivilExportVos.setFGnumber(zEngineeringCivilExportVo.getNumber().toString());
                 }
             }
-            if("立杠".equals(bo.getType())){
-                if(!ObjectUtils.isEmpty(zEngineeringCivilExportVos.getLGmaterialQuality())){
+            if ("立杠".equals(bo.getType())) {
+                if (!ObjectUtils.isEmpty(zEngineeringCivilExportVos.getLGmaterialQuality())) {
                     arrayList.add(zEngineeringCivilExportVos);
                 }
-            }else{
+            } else {
                 arrayList.add(zEngineeringCivilExportVos);
             }
         }
         return arrayList;
     }
+
     @Override
     public List<ZEngineeringCivilExportVos> exportListColor(ZEngineeringCivilBo bo) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
@@ -499,25 +514,25 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 zEngineeringCivilExportVos.setEnginType(zEngineeringCivilExportVo.getEnginType());
                 zEngineeringCivilExportVos.setEnginClassification(zEngineeringCivilExportVo.getEnginClassification());
                 zEngineeringCivilExportVos.setCompletionStatus(zEngineeringCivilExportVo.getCompletionStatus());
-                if ("拆旧管".equals(zEngineeringCivilExportVo.getType())||"打孔".equals(zEngineeringCivilExportVo.getType())){
+                if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) || "打孔".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx1(zEngineeringCivilExportVo.getReviewStatus());
                 }
-                if ("立杠".equals(zEngineeringCivilExportVo.getType())){
+                if ("立杠".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx2(zEngineeringCivilExportVo.getReviewStatus());
                 }
-                if ("挂表".equals(zEngineeringCivilExportVo.getType())){
+                if ("挂表".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx3(zEngineeringCivilExportVo.getReviewStatus());
                 }
-                if ("表后管".equals(zEngineeringCivilExportVo.getType())){
+                if ("表后管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx4(zEngineeringCivilExportVo.getReviewStatus());
                 }
-                if ("报警器".equals(zEngineeringCivilExportVo.getType())){
+                if ("报警器".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx5(zEngineeringCivilExportVo.getReviewStatus());
                 }
-                if ("切断阀".equals(zEngineeringCivilExportVo.getType())){
+                if ("切断阀".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx6(zEngineeringCivilExportVo.getReviewStatus());
                 }
-                if ("阀管".equals(zEngineeringCivilExportVo.getType())){
+                if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setGx7(zEngineeringCivilExportVo.getReviewStatus());
                 }
             }
@@ -794,21 +809,21 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         MonthTableNameHandler.removeData();
         LinkedList<String> list = baseMapper.getTableNames("z_engineering_info");
         list.removeLast();
-//        List<ZEngineeringInfoBo> mapList = baseMapper.getsumId(list, createTime, UserName);
+        //        List<ZEngineeringInfoBo> mapList = baseMapper.getsumId(list, createTime, UserName);
         List<String> zEngineeringNodeList = new ArrayList<>();
 
-//        List<String> nodeIds = mapList.stream().map(ZEngineeringInfoBo::getEngInfoId).collect(Collectors.toList());
+        //        List<String> nodeIds = mapList.stream().map(ZEngineeringInfoBo::getEngInfoId).collect(Collectors.toList());
         LocalDate startDate = LocalDate.of(2024, 3, 1); // 指定开始日期
         LocalDate endDate = LocalDate.now(); // 当前日期
         List<String> monthsBetween = getMonthsBetween(startDate, endDate);
-//        if(!ObjectUtils.isEmpty(nodeIds)){
-            zEngineeringNodeList.addAll(zEngineeringNodeMapper.selectNodeCivliIdListByMonth(monthsBetween, createTime,UserName));
-//        List<String> CivilList = zEngineeringNodeMapper.selectNodeCivliIdListByMonth(monthsBetween, createTime,bo);
-//        }
+        //        if(!ObjectUtils.isEmpty(nodeIds)){
+        zEngineeringNodeList.addAll(zEngineeringNodeMapper.selectNodeCivliIdListByMonth(monthsBetween, createTime, UserName));
+        //        List<String> CivilList = zEngineeringNodeMapper.selectNodeCivliIdListByMonth(monthsBetween, createTime,bo);
+        //        }
 
         List newList = zEngineeringNodeList.stream().distinct().collect(Collectors.toList());
         List<String> CivilList = new ArrayList();
-        if(!ObjectUtils.isEmpty(newList)){
+        if (!ObjectUtils.isEmpty(newList)) {
             LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
             lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
             lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
@@ -824,34 +839,34 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             CivilList = CivilList.stream().distinct().collect(Collectors.toList());
         }
 
-//        mapList.stream().forEach(item -> {
-//            String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
-//            MonthTableNameHandler.setData(date);
-//            LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
-//            lqw.eq(StringUtils.isNotBlank(item.getEngInfoId()), ZEngineeringNode::getId, item.getEngInfoId());
-//            ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectOne(lqw);
-//            if (!ObjectUtils.isEmpty(zEngineeringNode)){
-//                zEngineeringNodeList.add(zEngineeringNode.getCivliId());
-//                MonthTableNameHandler.removeData();
-//            }
-//        });
-//        List newList = zEngineeringNodeList.stream().distinct().collect(Collectors.toList());
-//        List CivilList = new ArrayList();
-//        newList.stream().forEach(item2 -> {
-//            LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
-//            lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
-//            lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
-//            lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
-//            lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-//            lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-//            lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
-//            lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
-//            lqw.eq(ZEngineeringCivil::getId, item2);
-//            ZEngineeringCivil zEngineeringCivil = baseMapper.selectOne(lqw);
-//            if (!ObjectUtils.isEmpty(zEngineeringCivil)) {
-//                CivilList.add(zEngineeringCivil.getId());
-//            }
-//        });
+        //        mapList.stream().forEach(item -> {
+        //            String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+        //            MonthTableNameHandler.setData(date);
+        //            LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+        //            lqw.eq(StringUtils.isNotBlank(item.getEngInfoId()), ZEngineeringNode::getId, item.getEngInfoId());
+        //            ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectOne(lqw);
+        //            if (!ObjectUtils.isEmpty(zEngineeringNode)){
+        //                zEngineeringNodeList.add(zEngineeringNode.getCivliId());
+        //                MonthTableNameHandler.removeData();
+        //            }
+        //        });
+        //        List newList = zEngineeringNodeList.stream().distinct().collect(Collectors.toList());
+        //        List CivilList = new ArrayList();
+        //        newList.stream().forEach(item2 -> {
+        //            LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        //            lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
+        //            lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
+        //            lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        //            lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
+        //            lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        //            lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+        //            lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
+        //            lqw.eq(ZEngineeringCivil::getId, item2);
+        //            ZEngineeringCivil zEngineeringCivil = baseMapper.selectOne(lqw);
+        //            if (!ObjectUtils.isEmpty(zEngineeringCivil)) {
+        //                CivilList.add(zEngineeringCivil.getId());
+        //            }
+        //        });
         return CivilList;
     }
 
@@ -977,9 +992,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             if (!ObjectUtils.isEmpty(zEngineeringNodeBo)) {
                 zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
                 zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
-                if (!ObjectUtils.isEmpty(zEngineeringNodeBo.getzEngineeringInfoBoList())){
+                if (!ObjectUtils.isEmpty(zEngineeringNodeBo.getzEngineeringInfoBoList())) {
                     zEngineeringNodeService.updateMuch(zEngineeringNodeBo);
-                }else if(!ObjectUtils.isEmpty(zEngineeringNodeBo.getzEngineeringInfoBo())){
+                } else if (!ObjectUtils.isEmpty(zEngineeringNodeBo.getzEngineeringInfoBo())) {
                     zEngineeringNodeService.updateMuch(zEngineeringNodeBo);
                 }
 
@@ -1065,8 +1080,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             List done = value.stream().filter(item -> item.getRoomStatus().equals("竣工")).collect(Collectors.toList());
             List notInstall = value.stream().filter(item -> item.getRoomStatus().equals("未安装")).collect(Collectors.toList());
             List<List<roomStatusVo>> roomStatusVoList = new ArrayList<>();
-            Map<String, List<roomStatusVo>> sortMap = roomMap.entrySet().stream().sorted(
-                Comparator.comparingInt(entry -> Integer.parseInt(entry.getKey()))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldVal, newVal) -> oldVal, LinkedHashMap::new));
+            Map<String, List<roomStatusVo>> sortMap = roomMap.entrySet().stream().sorted(Comparator.comparingInt(entry -> Integer.parseInt(entry.getKey()))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldVal, newVal) -> oldVal, LinkedHashMap::new));
             sortMap.forEach((key1, value1) -> {
                 roomStatusVoList.add(value1);
             });
@@ -1079,33 +1093,35 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         });
         return areaList;
     }
+
     @Override
     public List getObtainUnitCompletionInformationList(ZEngineeringCivilBo bo) { // 庭院 courtyard 架空 overhead 底腿 bottom_leg
-//        return getObtainUnitCompletionInformationList_all(bo);
+        //        return getObtainUnitCompletionInformationList_all(bo);
         return getObtainUnitCompletionInformationList_new(bo);
-//        switch (bo.getEnginClassification()){
-//            case "overhead": // 架空
-//            case "bottom_leg": { // 底腿
-//                return getObtainUnitCompletionInformationList_overleg(bo); // 查询条件 小区和楼栋 返回单元
-//            }
-//            case "courtyard":{ // 庭院 查询条件小区
-//                return getObtainUnitCompletionInformationList_courtyard(bo); // 返回楼栋 不返回单元数据
-//            }
-//            default:{
-//                return null;
-//            }
-//        }
+        //        switch (bo.getEnginClassification()){
+        //            case "overhead": // 架空
+        //            case "bottom_leg": { // 底腿
+        //                return getObtainUnitCompletionInformationList_overleg(bo); // 查询条件 小区和楼栋 返回单元
+        //            }
+        //            case "courtyard":{ // 庭院 查询条件小区
+        //                return getObtainUnitCompletionInformationList_courtyard(bo); // 返回楼栋 不返回单元数据
+        //            }
+        //            default:{
+        //                return null;
+        //            }
+        //        }
     }
+
     public List getObtainUnitCompletionInformationList_new(ZEngineeringCivilBo bo) { // 架空、底腿
-        String statusVoListName = bo.getEnginClassification().equals("courtyard")?"buildingStatusVoList":"unitStatusVoList";
+        String statusVoListName = bo.getEnginClassification().equals("courtyard") ? "buildingStatusVoList" : "unitStatusVoList";
         List<Map<String, Object>> result = new ArrayList();
         List<Map<String, Object>> statusList = baseMapper.getObtainUnitCompletionInformationList(bo);
         Set set = new HashSet();
-        for (Map item:  statusList) {
+        for (Map item : statusList) {
             set.add(item.get("areaId"));
         }
         Iterator iterator = set.iterator();
-        while (iterator.hasNext()){
+        while (iterator.hasNext()) {
             String areaId = iterator.next().toString();
             String areaName = zAreaMapper.selectById(areaId).getName();
             Map object = new HashMap();
@@ -1116,52 +1132,53 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             result.add(object);
         }
 
-        for (Map item: statusList) {
+        for (Map item : statusList) {
             String areaId = item.get("areaId").toString();
-            for (Map res: result) {
-                if(res.get("areaId").equals(areaId)){
-                    ((List)res.get(statusVoListName)).add(item);
+            for (Map res : result) {
+                if (res.get("areaId").equals(areaId)) {
+                    ((List) res.get(statusVoListName)).add(item);
                 }
             }
         }
-        for (Map res: result) {
-            List<Map> statusVoList = (List)res.get(statusVoListName);
+        for (Map res : result) {
+            List<Map> statusVoList = (List) res.get(statusVoListName);
             List willDone = statusVoList.stream().filter(item -> item.get("unitStatus").equals("未施工")).collect(Collectors.toList());
             List notstart = statusVoList.stream().filter(item -> item.get("unitStatus").equals("施工中")).collect(Collectors.toList());
             List done = statusVoList.stream().filter(item -> item.get("unitStatus").equals("竣工")).collect(Collectors.toList());
             List notInstall = statusVoList.stream().filter(item -> item.get("unitStatus").equals("未安装")).collect(Collectors.toList());
-            for (Object object: statusVoList) {
+            for (Object object : statusVoList) {
                 Map objMap = (Map) object;
                 objMap.put("done", String.valueOf(done.size()));
                 objMap.put("willDone", String.valueOf(willDone.size()));
                 objMap.put("notstart", String.valueOf(notstart.size()));
-//                String status = ((Map)object).get("unitStatus").toString();
+                //                String status = ((Map)object).get("unitStatus").toString();
             }
         }
 
-//        List areaList = new ArrayList();
-//        map.forEach((key, value) -> {
-//            Map buildingStatusVo = new HashMap();
-//            buildingStatusVo.put("name", key);
-//            buildingStatusVo.put("id", value.get(0).get("buildingId"));
-//            Map<String, List<Map>> unitMap = value.stream().collect(Collectors.groupingBy(item -> (item.get("ordername").toString().replaceAll("[^0-9]", "").length() > 3 ? item.get("ordername").toString().substring(0, 2) : item.get("ordername").toString().substring(0, 1))));
-//            List willDone = value.stream().filter(item -> item.get("unitStatus").equals("未施工")).collect(Collectors.toList());
-//            List notstart = value.stream().filter(item -> item.get("unitStatus").equals("施工中")).collect(Collectors.toList());
-//            List done = value.stream().filter(item -> item.get("unitStatus").equals("竣工")).collect(Collectors.toList());
-//            List notInstall = value.stream().filter(item -> item.get("unitStatus").equals("未安装")).collect(Collectors.toList());
-//            List<List<Map>> statusVoList = new ArrayList<>();
-//            Map<String, List<Map>> sortMap = unitMap.entrySet().stream().sorted(Comparator.comparingInt(entry -> Integer.parseInt(entry.getKey()))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldVal, newVal) -> oldVal, LinkedHashMap::new));
-//            sortMap.forEach((key1, value1) -> {
-//                statusVoList.add(value1);
-//            });
-//            buildingStatusVo.put("statusVoList", statusVoList);
-//            buildingStatusVo.put("done", String.valueOf(done.size()));
-//            buildingStatusVo.put("willDone", String.valueOf(willDone.size()));
-//            buildingStatusVo.put("notstart", String.valueOf(notstart.size()));
-//            areaList.add(buildingStatusVo);
-//        });
+        //        List areaList = new ArrayList();
+        //        map.forEach((key, value) -> {
+        //            Map buildingStatusVo = new HashMap();
+        //            buildingStatusVo.put("name", key);
+        //            buildingStatusVo.put("id", value.get(0).get("buildingId"));
+        //            Map<String, List<Map>> unitMap = value.stream().collect(Collectors.groupingBy(item -> (item.get("ordername").toString().replaceAll("[^0-9]", "").length() > 3 ? item.get("ordername").toString().substring(0, 2) : item.get("ordername").toString().substring(0, 1))));
+        //            List willDone = value.stream().filter(item -> item.get("unitStatus").equals("未施工")).collect(Collectors.toList());
+        //            List notstart = value.stream().filter(item -> item.get("unitStatus").equals("施工中")).collect(Collectors.toList());
+        //            List done = value.stream().filter(item -> item.get("unitStatus").equals("竣工")).collect(Collectors.toList());
+        //            List notInstall = value.stream().filter(item -> item.get("unitStatus").equals("未安装")).collect(Collectors.toList());
+        //            List<List<Map>> statusVoList = new ArrayList<>();
+        //            Map<String, List<Map>> sortMap = unitMap.entrySet().stream().sorted(Comparator.comparingInt(entry -> Integer.parseInt(entry.getKey()))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldVal, newVal) -> oldVal, LinkedHashMap::new));
+        //            sortMap.forEach((key1, value1) -> {
+        //                statusVoList.add(value1);
+        //            });
+        //            buildingStatusVo.put("statusVoList", statusVoList);
+        //            buildingStatusVo.put("done", String.valueOf(done.size()));
+        //            buildingStatusVo.put("willDone", String.valueOf(willDone.size()));
+        //            buildingStatusVo.put("notstart", String.valueOf(notstart.size()));
+        //            areaList.add(buildingStatusVo);
+        //        });
         return result;
     }
+
     public List getObtainUnitCompletionInformationList_all(ZEngineeringCivilBo bo) { // 架空、底腿
         List<Map<String, Object>> statusList = baseMapper.getObtainUnitCompletionInformationList(bo);
         LinkedHashMap<String, List<Map>> map = new LinkedHashMap<>();
@@ -1199,6 +1216,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         });
         return areaList;
     }
+
     public List getObtainUnitCompletionInformationList_overleg(ZEngineeringCivilBo bo) { // 架空、底腿
         List<UnitStatusVo> unitStatusList = baseMapper.getObtainUnitCompletionInformationList_overleg(bo);
         LinkedHashMap<String, List<UnitStatusVo>> map = new LinkedHashMap<>();
@@ -1214,11 +1232,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         }
         List areaList = new ArrayList();
         map.forEach((key, value) -> {
-//            BulidingStatusVo bulidingStatusVo = new BulidingStatusVo();
+            //            BulidingStatusVo bulidingStatusVo = new BulidingStatusVo();
             Map buildingStatusVo = new HashMap();
-//            bulidingStatusVo.setUnitName(key);
+            //            bulidingStatusVo.setUnitName(key);
             buildingStatusVo.put("buildingName", key);
-//            bulidingStatusVo.setUnitId(value.get(0).getUnitId());
+            //            bulidingStatusVo.setUnitId(value.get(0).getUnitId());
             buildingStatusVo.put("buildingId", value.get(0).getBuildingId());
             Map<String, List<UnitStatusVo>> unitMap = value.stream().collect(Collectors.groupingBy(item -> (item.getBuildingName().replaceAll("[^0-9]", "").length() > 3 ? item.getBuildingName().substring(0, 2) : item.getBuildingName().substring(0, 1))));
             List willDone = value.stream().filter(item -> item.getUnitStatus().equals("未施工")).collect(Collectors.toList());
@@ -1230,20 +1248,21 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             sortMap.forEach((key1, value1) -> {
                 unitStatusVoList.add(value1);
             });
-//            bulidingStatusVo.setUnitStatusVoList(unitStatusVoList);
+            //            bulidingStatusVo.setUnitStatusVoList(unitStatusVoList);
             buildingStatusVo.put("unitStatusVoList", unitStatusVoList);
-//            bulidingStatusVo.setDone(String.valueOf(notInstall.size()));
-//            bulidingStatusVo.put("done", String.valueOf(notInstall.size()));
-//            bulidingStatusVo.setDone(String.valueOf(done.size()));
+            //            bulidingStatusVo.setDone(String.valueOf(notInstall.size()));
+            //            bulidingStatusVo.put("done", String.valueOf(notInstall.size()));
+            //            bulidingStatusVo.setDone(String.valueOf(done.size()));
             buildingStatusVo.put("done", String.valueOf(done.size()));
-//            bulidingStatusVo.setWillDone(String.valueOf(willDone.size()));
+            //            bulidingStatusVo.setWillDone(String.valueOf(willDone.size()));
             buildingStatusVo.put("willDone", String.valueOf(willDone.size()));
-//            bulidingStatusVo.setNotstart(String.valueOf(notstart.size()));
+            //            bulidingStatusVo.setNotstart(String.valueOf(notstart.size()));
             buildingStatusVo.put("notstart", String.valueOf(notstart.size()));
             areaList.add(buildingStatusVo);
         });
         return areaList;
     }
+
     public List getObtainUnitCompletionInformationList_courtyard(ZEngineeringCivilBo bo) { // 庭院
         List<BuildingStatusVo> buildingStatusList = baseMapper.getObtainUnitCompletionInformationList_courtyard(bo);
         LinkedHashMap<String, List<BuildingStatusVo>> map = new LinkedHashMap<>();
@@ -1259,11 +1278,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         }
         List areaList = new ArrayList();
         map.forEach((key, value) -> {
-//            BulidingStatusVo bulidingStatusVo = new BulidingStatusVo();
+            //            BulidingStatusVo bulidingStatusVo = new BulidingStatusVo();
             Map bulidingStatusVo = new HashMap();
-//            bulidingStatusVo.setUnitName(key);
+            //            bulidingStatusVo.setUnitName(key);
             bulidingStatusVo.put("areaName", key);
-//            bulidingStatusVo.setUnitId(value.get(0).getUnitId());
+            //            bulidingStatusVo.setUnitId(value.get(0).getUnitId());
             bulidingStatusVo.put("areaId", value.get(0).getAreaId());
             Map<String, List<BuildingStatusVo>> buildingMap = value.stream().collect(Collectors.groupingBy(item -> (item.getAreaName().replaceAll("[^0-9]", "").length() > 3 ? item.getAreaName().substring(0, 2) : item.getAreaName().substring(0, 1))));
             List willDone = value.stream().filter(item -> item.getBuildingStatus().equals("未施工")).collect(Collectors.toList());
@@ -1275,15 +1294,15 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             sortMap.forEach((key1, value1) -> {
                 buildingStatusVoList.add(value1);
             });
-//            bulidingStatusVo.setUnitStatusVoList(unitStatusVoList);
+            //            bulidingStatusVo.setUnitStatusVoList(unitStatusVoList);
             bulidingStatusVo.put("buildingStatusVoList", buildingStatusVoList);
-//            bulidingStatusVo.setDone(String.valueOf(notInstall.size()));
-//            bulidingStatusVo.put("done", String.valueOf(notInstall.size()));
-//            bulidingStatusVo.setDone(String.valueOf(done.size()));
+            //            bulidingStatusVo.setDone(String.valueOf(notInstall.size()));
+            //            bulidingStatusVo.put("done", String.valueOf(notInstall.size()));
+            //            bulidingStatusVo.setDone(String.valueOf(done.size()));
             bulidingStatusVo.put("done", String.valueOf(done.size()));
-//            bulidingStatusVo.setWillDone(String.valueOf(willDone.size()));
+            //            bulidingStatusVo.setWillDone(String.valueOf(willDone.size()));
             bulidingStatusVo.put("willDone", String.valueOf(willDone.size()));
-//            bulidingStatusVo.setNotstart(String.valueOf(notstart.size()));
+            //            bulidingStatusVo.setNotstart(String.valueOf(notstart.size()));
             bulidingStatusVo.put("notstart", String.valueOf(notstart.size()));
             areaList.add(bulidingStatusVo);
         });
@@ -1295,7 +1314,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZArea> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZArea::getId, bo.getAreaId());
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZArea::getDistrict, bo.getDistrict());
-//        Page<ZBuildingBo> page = new Page<>(po.getPageNum(), po.getPageSize());
+        //        Page<ZBuildingBo> page = new Page<>(po.getPageNum(), po.getPageSize());
         Page<ZAreaVo> result = zAreaMapper.selectVoPage(po.build(), lqw);
         List<ZAreaVo> IdList = result.getRecords();
         List Id = new ArrayList();
@@ -1426,17 +1445,15 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             });
         }
         infoIdList.getInfoIdList().stream().forEach(item -> {
-            if(StringUtils.isNotBlank(zEngineeringReviewBo.getReviewStatus())){
+            if (StringUtils.isNotBlank(zEngineeringReviewBo.getReviewStatus())) {
                 item.setState(zEngineeringReviewBo.getReviewStatus());
                 SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
                 UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
-                lqw.eq("id", item.getId())
-                    .set("state", zEngineeringReviewBo.getReviewStatus())
-                    .set("content",zEngineeringReviewBo.getReviewContent());
+                lqw.eq("id", item.getId()).set("state", zEngineeringReviewBo.getReviewStatus()).set("content", zEngineeringReviewBo.getReviewContent());
                 MonthTableNameHandler.setData(format.format(item.getCreateTime()));
                 zEngineeringInfoMapper.update(lqw);
                 MonthTableNameHandler.removeData();
-            }else{
+            } else {
                 throw new ServiceException("未选择审核状态！！！");
             }
         });
@@ -1488,7 +1505,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         } else if (zEngineeringCivilBo.getEnginType().equals("new_built")) {
             zEngineeringCivilBo.setEnginType("新建");
         }
-        if(zEngineeringReviewBo.getReviewStatus().equals("1")){
+        if (zEngineeringReviewBo.getReviewStatus().equals("1")) {
             izEngiineeringPhotoService.write(zEngineeringCivilBo);
         }
         return 0;
@@ -1502,12 +1519,12 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 item.setState(zEngineeringReviewBo.getReviewStatus());
                 SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
                 UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
-                lqw.eq("id", item.getId()).set("state", zEngineeringReviewBo.getReviewStatus()).set("content",zEngineeringReviewBo.getReviewContent());
+                lqw.eq("id", item.getId()).set("state", zEngineeringReviewBo.getReviewStatus()).set("content", zEngineeringReviewBo.getReviewContent());
                 MonthTableNameHandler.setData(format.format(item.getCreateTime()));
                 zEngineeringInfoMapper.update(lqw);
                 MonthTableNameHandler.removeData();
-                if(zEngineeringReviewBo.getReviewStatus().equals("1")){
-                    izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item,zEngineeringReviewBo.getEngInfoName());
+                if (zEngineeringReviewBo.getReviewStatus().equals("1")) {
+                    izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item, zEngineeringReviewBo.getEngInfoName());
                 }
             });
             izEngineeringReviewService.insert(zEngineeringReviewBo);