提交代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java

@@ -16,10 +16,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.bo.switchBo;
-import com.ruoyi.zdsz.domain.vo.BulidingStatusVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.vo.areaStatusVo;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.service.IZEngineeringCivilService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
@@ -31,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -75,8 +73,8 @@ public class ZEngineeringCivilController extends BaseController {
     @Log(title = "民用工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringCivilBo bo, PageQuery pageQuery, HttpServletResponse response) {
-        List<ZEngineeringCivilExportVo> list = iZEngineeringCivilService.exportList(bo);
-        ExcelUtil.exportExcel(list, "民用工程", ZEngineeringCivilExportVo.class, response);
+        List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportList(bo);
+        ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程", "excel/civilExcel.xlsx", response);
     }
 
     /**

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

@@ -250,6 +250,7 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "规格")
     private String specifications;
     private String specificationsName;
+    private String source;
 
     /**
      * 数量

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

@@ -0,0 +1,61 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 民用工程视图对象 z_engineering_civil
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringCivilExportVos extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String district;
+
+    private String areaId;
+
+    private String buildingId;
+
+    private String unitId;
+
+    private String houseId;
+
+    private String source;
+
+    private String enginType;
+
+    private String enginClassification;
+
+    private String completionStatus;
+
+    private String corrosionLevel;
+    private String LGmaterialQuality;
+    private String LGspecifications;
+    private String LGnumber;
+    private String brand;
+    private String BHGmaterialQuality;
+    private String BHGspecifications;
+    private String BHGnumber;
+    private String BJQmaterialQuality;
+    private String QDFmaterialQuality;
+    private String visitType;
+    private String FGmaterialQuality;
+    private String FGspecifications;
+    private String FGnumber;
+
+}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringCivilMapper.java

@@ -35,4 +35,6 @@ public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivi
     List<ZEngineeringInfoBo> getsumId(@Param("tableNames") List tableNames, @Param("createTime")List createTime, @Param("UserName") String UserName);
     List<ZEngineeringCivilExportVo> getexportList(@Param("tableNames") List tableNames,@Param("createTime") String createTime,@Param("p") ZEngineeringCivilBo bo);
     Long getTypeNumber( @Param("tableNames") List tableNames,@Param("p")ZEngineeringCivilBo bo);
+
+
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringCivilService.java

@@ -5,13 +5,10 @@ import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.bo.switchBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.zdsz.domain.vo.areaStatusVo;
-import com.ruoyi.zdsz.domain.vo.roomStatusVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +36,7 @@ public interface IZEngineeringCivilService {
      * 查询民用工程列表
      */
     TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
-    List<ZEngineeringCivilExportVo> exportList(ZEngineeringCivilBo bo);
+    List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo);
 
     /**
      * 查询民用工程列表

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

@@ -1,6 +1,8 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONObject;
 import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -82,10 +84,10 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             jg.add(item.get("jungong"));
         }
         Map<String, List<?>> listMap = new HashMap<>();
-        listMap.put("name",name);
-        listMap.put("wsh",wsg);
-        listMap.put("ysg",ysg);
-        listMap.put("jg",jg);
+        listMap.put("name", name);
+        listMap.put("wsh", wsg);
+        listMap.put("ysg", ysg);
+        listMap.put("jg", jg);
         return listMap;
     }
 
@@ -141,24 +143,24 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
         if (StringUtils.isEmpty(zEngineeringCivilBo.getBuildingId())) {
             lqw.isNull(ZEngineeringCivil::getBuildingId);
-        }else {
+        } else {
             lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
         }
         if (StringUtils.isEmpty(zEngineeringCivilBo.getUnitId())) {
             lqw.isNull(ZEngineeringCivil::getUnitId);
-        }else{
+        } else {
             lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
         }
         if (StringUtils.isEmpty(zEngineeringCivilBo.getHouseId())) {
             lqw.isNull(ZEngineeringCivil::getHouseId);
-        }else {
+        } else {
             lqw.eq(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
         }
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());
         ZEngineeringCivilVo selected = baseMapper.selectVoOne(lqw);
-        if (!ObjectUtils.isEmpty(selected)){
+        if (!ObjectUtils.isEmpty(selected)) {
             selected.setzEngineeringNodeBoList(izEngineeringNodeService.queryNodeList(BeanUtil.copyProperties(selected, ZEngineeringCivil.class)));
         }
         return selected;
@@ -179,67 +181,123 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         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.selectList(lqw),bo.getType(),bo.getCompletionStatus(),bo);
+        Page<ZEngineeringCivilVo> result = new Page<>();
+        if (!"".equals(bo.getType()) && !ObjectUtils.isEmpty(bo.getType())) {
+            List IDList = zEngineeringNodeService.nodeTypeList(baseMapper.selectList(lqw), bo.getType(), bo.getCompletionStatus(), bo);
 
-            if (IDList.size()==0)
-            {
+            if (IDList.size() == 0) {
                 return TableDataInfo.build(result);
             }
-            LinkedList <String>list=baseMapper.getTableNames("z_engineering_info");
-            List DateList=new ArrayList();
+            LinkedList<String> list = baseMapper.getTableNames("z_engineering_info");
+            List DateList = new ArrayList();
             list.removeLast();
-            list.stream().forEach(item->{
+            list.stream().forEach(item -> {
 
                 DateList.add(item.substring(item.indexOf("2")));
             });
-          result = baseMapper.queryPageIdList(IDList, baseMapper.getTypeNumber(DateList,bo), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
-            result.getRecords().forEach(item->{
-                    item.setNodeReViewStateList(ReviewList.get(item.getId()));
+            result = baseMapper.queryPageIdList(IDList, baseMapper.getTypeNumber(DateList, bo), page, pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+            Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result.getRecords());
+            result.getRecords().forEach(item -> {
+                item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });
             page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
             return TableDataInfo.build(result);
         }
-        if((!"".equals(bo.getBeginTime())&&!ObjectUtils.isEmpty(bo.getBeginTime()))||(!"".equals(bo.getCreateBy())&&!ObjectUtils.isEmpty(bo.getCreateBy())))
-        {
-            List<String> a= zEngineeringCivilList(bo.getBeginTime(),bo.getCreateBy(),bo);
-            if (a.size()==0)
-            {
+        if ((!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) || (!"".equals(bo.getCreateBy()) && !ObjectUtils.isEmpty(bo.getCreateBy()))) {
+            List<String> a = zEngineeringCivilList(bo.getBeginTime(), bo.getCreateBy(), bo);
+            if (a.size() == 0) {
                 return TableDataInfo.build(result);
             }
-            result = baseMapper.queryPageIdList( a, Long.parseLong(String.valueOf(a.size())), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
-            result.getRecords().forEach(item->{
+            result = baseMapper.queryPageIdList(a, Long.parseLong(String.valueOf(a.size())), page, pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+            Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result.getRecords());
+            result.getRecords().forEach(item -> {
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });
             page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
             return TableDataInfo.build(result);
         }
-        result = baseMapper.queryPageList(bo, page, (pageQuery.getPageNum()-1)*pageQuery.getPageSize() , pageQuery.getPageSize());
-        Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
-        result.getRecords().forEach(item->{
-                item.setNodeReViewStateList(ReviewList.get(item.getId()));
+        result = baseMapper.queryPageList(bo, page, (pageQuery.getPageNum() - 1) * pageQuery.getPageSize(), pageQuery.getPageSize());
+        Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result.getRecords());
+        result.getRecords().forEach(item -> {
+            item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });
         page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
         return TableDataInfo.build(result);
     }
 
     @Override
-    public List<ZEngineeringCivilExportVo> exportList(ZEngineeringCivilBo bo) {
-              SimpleDateFormat format=new SimpleDateFormat("yyyy_MM");
-              LinkedList <String>list=baseMapper.getTableNames("z_engineering_info");
-              list.removeLast();
-              List DateList=new ArrayList();
-              list.stream().forEach(item->{
-
-                  DateList.add(item.substring(item.indexOf("2")));
-              });
-
-              List<ZEngineeringCivilExportVo> zEngineeringCivilExportVoList=baseMapper.getexportList(DateList,format.format(new Date()),bo);
-        return zEngineeringCivilExportVoList;
+    public List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
+        LinkedList<String> list = baseMapper.getTableNames("z_engineering_info");
+        list.removeLast();
+        List DateList = new ArrayList();
+        list.stream().forEach(item -> {
+            DateList.add(item.substring(item.indexOf("2")));
+        });
+        List<ZEngineeringCivilExportVo> zEngineeringCivilExportVoList = baseMapper.getexportList(DateList, format.format(new Date()), bo);
+
+        HashMap<String, List<ZEngineeringCivilExportVo>> hashMap = new HashMap<>();
+
+        for (int i = 0; i < zEngineeringCivilExportVoList.size(); i++) {
+            if (hashMap.containsKey(zEngineeringCivilExportVoList.get(i).getId())) {
+                List<ZEngineeringCivilExportVo> zEngineeringCivilExportVos = hashMap.get(zEngineeringCivilExportVoList.get(i).getId());
+                zEngineeringCivilExportVos.add(zEngineeringCivilExportVoList.get(i));
+            } else {
+                List<ZEngineeringCivilExportVo> zEngineeringCivilExportVos = new ArrayList<>();
+                zEngineeringCivilExportVos.add(zEngineeringCivilExportVoList.get(i));
+                hashMap.put(zEngineeringCivilExportVoList.get(i).getId(), zEngineeringCivilExportVos);
+            }
+        }
+        ArrayList<ZEngineeringCivilExportVos> arrayList = new ArrayList<>();
+        List<String> strings = new ArrayList<>();
+        for (Map.Entry<String, List<ZEngineeringCivilExportVo>> stringListEntry : hashMap.entrySet()) {
+            strings.add(stringListEntry.getKey());
+        }
+        for (String string : strings) {
+            ZEngineeringCivilExportVos zEngineeringCivilExportVos = new ZEngineeringCivilExportVos();
+            for (ZEngineeringCivilExportVo zEngineeringCivilExportVo : hashMap.get(string)) {
+                zEngineeringCivilExportVos.setDistrict(zEngineeringCivilExportVo.getDistrict());
+                zEngineeringCivilExportVos.setAreaId(zEngineeringCivilExportVo.getAreaId());
+                zEngineeringCivilExportVos.setBuildingId(zEngineeringCivilExportVo.getBuildingId());
+                zEngineeringCivilExportVos.setUnitId(zEngineeringCivilExportVo.getUnitId());
+                zEngineeringCivilExportVos.setHouseId(zEngineeringCivilExportVo.getHouseId());
+                zEngineeringCivilExportVos.setSource(zEngineeringCivilExportVo.getSource());
+                zEngineeringCivilExportVos.setEnginType(zEngineeringCivilExportVo.getEnginType());
+                zEngineeringCivilExportVos.setEnginClassification(zEngineeringCivilExportVo.getEnginClassification());
+                zEngineeringCivilExportVos.setCompletionStatus(zEngineeringCivilExportVo.getCompletionStatus());
+                if ("拆旧管".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
+                if ("打孔".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
+                if ("立杠".equals(zEngineeringCivilExportVo.getType())){
+                    zEngineeringCivilExportVos.setLGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                    zEngineeringCivilExportVos.setLGspecifications(zEngineeringCivilExportVo.getSpecifications());
+                    zEngineeringCivilExportVos.setLGnumber(zEngineeringCivilExportVo.getNumber().toString());
+                }
+                if ("挂表".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setBrand(zEngineeringCivilExportVo.getBrand());
+                if ("表后管".equals(zEngineeringCivilExportVo.getType())){
+                    zEngineeringCivilExportVos.setBHGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                    zEngineeringCivilExportVos.setBHGspecifications(zEngineeringCivilExportVo.getSpecifications());
+                    zEngineeringCivilExportVos.setBHGnumber(zEngineeringCivilExportVo.getNumber().toString());
+                }
+                if ("报警器".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                if ("阀管".equals(zEngineeringCivilExportVo.getType())){
+                    zEngineeringCivilExportVos.setVisitType(zEngineeringCivilExportVo.getVisitType());
+                    zEngineeringCivilExportVos.setFGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                    zEngineeringCivilExportVos.setFGspecifications(zEngineeringCivilExportVo.getSpecifications());
+                    if (!ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber()))
+                        zEngineeringCivilExportVos.setFGnumber(zEngineeringCivilExportVo.getNumber().toString());
+                }
+            }
+            arrayList.add(zEngineeringCivilExportVos);
+        }
+
+
+        return arrayList;
     }
 
     /**
@@ -266,25 +324,26 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), ZEngineeringCivil::getImgUrl, bo.getImgUrl());
         return lqw;
     }
-    private List<String> zEngineeringCivilList(List createTime, String UserName,ZEngineeringCivilBo bo){
+
+    private List<String> zEngineeringCivilList(List createTime, String UserName, ZEngineeringCivilBo bo) {
         MonthTableNameHandler.removeData();
-        LinkedList <String>list=baseMapper.getTableNames("z_engineering_info");
+        LinkedList<String> list = baseMapper.getTableNames("z_engineering_info");
         list.removeLast();
-        List<ZEngineeringInfoBo> mapList= baseMapper.getsumId(list,createTime,UserName);
-        List<String> zEngineeringNodeList=new ArrayList<>();
-        mapList.stream().forEach(item->{
-            String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+        List<ZEngineeringInfoBo> mapList = baseMapper.getsumId(list, createTime, UserName);
+        List<String> zEngineeringNodeList = new ArrayList<>();
+        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());
+            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->{
+        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());
@@ -293,15 +352,16 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             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))
-            {
+            lqw.eq(ZEngineeringCivil::getId, item2);
+            ZEngineeringCivil zEngineeringCivil = baseMapper.selectOne(lqw);
+            if (!ObjectUtils.isEmpty(zEngineeringCivil)) {
                 CivilList.add(zEngineeringCivil.getId());
             }
         });
         return CivilList;
-    };
+    }
+
+    ;
 
     @Autowired
     private ZEngineeringNodeServiceImpl zEngineeringNodeService;
@@ -318,24 +378,24 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
         if (StringUtils.isEmpty(bo.getBuildingId())) {
             lqw.isNull(ZEngineeringCivil::getBuildingId);
-        }else {
+        } else {
             lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
         }
         if (StringUtils.isEmpty(bo.getUnitId())) {
             lqw.isNull(ZEngineeringCivil::getUnitId);
-        }else{
+        } else {
             lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
         }
         if (StringUtils.isEmpty(bo.getHouseId())) {
             lqw.isNull(ZEngineeringCivil::getHouseId);
-        }else {
+        } else {
             lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
         }
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
-        if ("indoor_engin".equals(bo.getEnginClassification())||"courtyard".equals(bo.getEnginClassification())||"overhead".equals(bo.getEnginClassification())) {
+        if ("indoor_engin".equals(bo.getEnginClassification()) || "courtyard".equals(bo.getEnginClassification()) || "overhead".equals(bo.getEnginClassification())) {
             if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
                 izMaterialStatisticsService.insert(bo);
         }
@@ -394,9 +454,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             if (!ObjectUtils.isEmpty(bo.getHouseId())) {
                 LambdaQueryWrapper<ZEnginNotInstalled> notInstalledLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEnginNotInstalled::getAreaId, bo.getAreaId());
-                    notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getBuildingId()),ZEnginNotInstalled::getBuildingId, bo.getBuildingId());
-                    notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getUnitId()),ZEnginNotInstalled::getUnitId, bo.getUnitId());
-                    notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getHouseId()),ZEnginNotInstalled::getHouseId, bo.getHouseId());
+                notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEnginNotInstalled::getBuildingId, bo.getBuildingId());
+                notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEnginNotInstalled::getUnitId, bo.getUnitId());
+                notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEnginNotInstalled::getHouseId, bo.getHouseId());
                 zEnginNotInstalledMapper.delete(notInstalledLambdaQueryWrapper);
             }
             return true;
@@ -481,24 +541,22 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         List<roomStatusVo> roomStatusList = baseMapper.getObtainRoomcCompletionInformationList(bo);
         LinkedHashMap<String, List<roomStatusVo>> map = new LinkedHashMap<>();
         List<roomStatusVo> mapvalue = new ArrayList<>();
-        for (int i=0;i<roomStatusList.size();i++) {
-            if(i > 0 && roomStatusList.get(i).getUnitOrder().equals(roomStatusList.get(i-1).getUnitOrder())){
+        for (int i = 0; i < roomStatusList.size(); i++) {
+            if (i > 0 && roomStatusList.get(i).getUnitOrder().equals(roomStatusList.get(i - 1).getUnitOrder())) {
                 mapvalue.add(roomStatusList.get(i));
-            }else{
+            } else {
                 mapvalue = new ArrayList<>();
                 mapvalue.add(roomStatusList.get(i));
             }
-            map.put(roomStatusList.get(i).getUnitName(),mapvalue);
+            map.put(roomStatusList.get(i).getUnitName(), mapvalue);
         }
-//        map = roomStatusList.stream().collect(Collectors.groupingBy(item -> item.getUnitName()));
+        //        map = roomStatusList.stream().collect(Collectors.groupingBy(item -> item.getUnitName()));
         List areaList = new ArrayList();
         map.forEach((key, value) -> {
             BulidingStatusVo bulidingStatusVo = new BulidingStatusVo();
             bulidingStatusVo.setUnitName(key);
             bulidingStatusVo.setUnitId(value.get(0).getUnitId());
-            Map<String, List<roomStatusVo>> roomMap = value.stream().collect(Collectors.groupingBy(item -> (
-                item.getRoomName().replaceAll("[^0-9]","").length() > 3 ? item.getRoomName().substring(0,2):item.getRoomName().substring(0,1))
-                ));
+            Map<String, List<roomStatusVo>> roomMap = value.stream().collect(Collectors.groupingBy(item -> (item.getRoomName().replaceAll("[^0-9]", "").length() > 3 ? item.getRoomName().substring(0, 2) : item.getRoomName().substring(0, 1))));
             List willDone = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
             List notstart = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
             List done = value.stream().filter(item -> item.getRoomStatus().equals("竣工")).collect(Collectors.toList());
@@ -533,8 +591,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         List<areaStatusVo> areaList = new ArrayList<>();
         stringListMap.forEach((key, value) -> {
             areaStatusVo areaStatusVo = new areaStatusVo();
-            List  notstart = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
-            List  willDone = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
+            List notstart = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
+            List willDone = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
             List done = value.stream().filter(item -> item.getRoomStatus().equals("竣工")).collect(Collectors.toList());
             areaStatusVo.setAreaId(key);
             areaStatusVo.setAreaName(value.get(0).getName());
@@ -552,13 +610,13 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     @Override
     public List<areaStatusVo> getAreaCompletionInformationList2(ZEngineeringCivilBo bo) {
-        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList2( bo.getEnginCycle());
+        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList2(bo.getEnginCycle());
         Map<String, List<areaWillDoneVo>> stringListMap = hourseList.stream().collect(Collectors.groupingBy(item -> item.getAreaId()));
         List<areaStatusVo> areaList = new ArrayList<>();
         stringListMap.forEach((key, value) -> {
             areaStatusVo areaStatusVo = new areaStatusVo();
-            List  notstart = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
-            List  willDone = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
+            List notstart = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
+            List willDone = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
             List done = value.stream().filter(item -> item.getRoomStatus().equals("竣工")).collect(Collectors.toList());
             areaStatusVo.setAreaId(key);
             areaStatusVo.setAreaName(value.get(0).getName());
@@ -573,9 +631,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     }
 
     @Override
-    public Map<String,Number> getsumStatus(ZEngineeringCivilBo bo) {
-        Map<String,Number> areaStatusVo = baseMapper.getsumStatus(bo.getDistrict());
-//        areaStatusVo.setNotstart(String.valueOf(Integer.parseInt(areaStatusVo.getNotstart()) - Integer.parseInt(areaStatusVo.getWillDone()) - Integer.parseInt(areaStatusVo.getDone())));
+    public Map<String, Number> getsumStatus(ZEngineeringCivilBo bo) {
+        Map<String, Number> areaStatusVo = baseMapper.getsumStatus(bo.getDistrict());
+        //        areaStatusVo.setNotstart(String.valueOf(Integer.parseInt(areaStatusVo.getNotstart()) - Integer.parseInt(areaStatusVo.getWillDone()) - Integer.parseInt(areaStatusVo.getDone())));
         return areaStatusVo;
     }
 
@@ -645,39 +703,36 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
         zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
         izEngineeringReviewService.Civilinsert(zEngineeringCivil, zEngineeringReviewBo);
-        areaMessageVo areaMessageVo=new areaMessageVo();
-        if (zEngineeringCivilBo.getEnginClassification().equals("courtyard")||zEngineeringCivilBo.getEnginClassification().equals("overhead "))
-        {
-            if (!"".equals(zEngineeringCivilBo.getBuildingId()))
-            {
+        areaMessageVo areaMessageVo = new areaMessageVo();
+        if (zEngineeringCivilBo.getEnginClassification().equals("courtyard") || zEngineeringCivilBo.getEnginClassification().equals("overhead ")) {
+            if (!"".equals(zEngineeringCivilBo.getBuildingId())) {
                 areaMessageVo = baseMapper.getAreaMessage(zEngineeringCivilBo.getBuildingId());
                 areaMessageVo.setHouseId("未知");
                 areaMessageVo.setUnitId("未知");
-            }else
-            {
+            } else {
                 areaMessageVo = baseMapper.getAreaName(zEngineeringCivilBo.getAreaId());
                 areaMessageVo.setHouseId("未知");
                 areaMessageVo.setUnitId("未知");
                 areaMessageVo.setBuildingId("未知");
             }
-        }else{
+        } else {
             areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
         }
-//        areaMessageVo areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
+        //        areaMessageVo areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
         if (!ObjectUtils.isEmpty(areaMessageVo))
 
-        BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
+            BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item -> {
             if (item.getDictValue().equals(zEngineeringCivilBo.getEnginClassification())) {
                 zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
             }
         });
-//        sysDictMap.get(zEngineeringCivilBo.getEnginType() + "_" + zEngineeringCivilBo.getEnginClassification()).stream().forEach(item -> {
-//            if (item.getDictValue().equals(zEngineeringCivilBo.getzEngineeringNodeBo().getType())) {
-//                zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
-//            }
-//        });
+        //        sysDictMap.get(zEngineeringCivilBo.getEnginType() + "_" + zEngineeringCivilBo.getEnginClassification()).stream().forEach(item -> {
+        //            if (item.getDictValue().equals(zEngineeringCivilBo.getzEngineeringNodeBo().getType())) {
+        //                zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
+        //            }
+        //        });
         sysDictMap.get("engin_cycle").stream().forEach(item -> {
             if (item.getDictValue().equals(zEngineeringCivilBo.getEnginCycle())) {
                 zEngineeringCivilBo.setEnginCycle(item.getDictLabel());
@@ -697,13 +752,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     @Override
     public List<ZEngineeringNodeBo> getRivewStatus(String Id) {
-        ZEngineeringCivil zEngineeringCivil1= baseMapper.selectById(Id);
-        if(!ObjectUtils.isEmpty(zEngineeringCivil1))
-        {
+        ZEngineeringCivil zEngineeringCivil1 = baseMapper.selectById(Id);
+        if (!ObjectUtils.isEmpty(zEngineeringCivil1)) {
 
             return izEngineeringNodeService.queryNodeList(zEngineeringCivil1);
-        }else
-        {
+        } else {
             return null;
         }
 
@@ -711,9 +764,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     @Override
     public Boolean batchNode(ZEngineeringCivilBo bo) {
-     List<ZHouse> zHouseList=zHouseMapper.selectHouseId(bo);
-         zEngineeringNodeService.batchNode(zHouseList,bo,LoginHelper.getLoginUser().getUserId().toString());
-        return true ;
+        List<ZHouse> zHouseList = zHouseMapper.selectHouseId(bo);
+        zEngineeringNodeService.batchNode(zHouseList, bo, LoginHelper.getLoginUser().getUserId().toString());
+        return true;
 
     }
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -296,11 +296,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getexportList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo">
         SELECT
+        a.id,
         a.district,
         g.`name` AS area_id,
         h.`name` AS building_id,
         i.`name` AS unit_id,
         j.`name` AS house_id,
+        j.`source` AS source,
         k.dict_label AS engin_classification,
         CASE
         a.engin_type
@@ -375,11 +377,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="tableNames" item="name">
             union
             SELECT
+            a.id,
             a.district,
             g.`name` AS area_id,
             h.`name` AS building_id,
             i.`name` AS unit_id,
             j.`name` AS house_id,
+            j.`source` AS source,
             k.dict_label AS engin_classification,
             CASE
             a.engin_type