提交代码

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

@@ -48,16 +48,16 @@ public class ZEngineeringCivilController extends BaseController {
 
     /**
      * 根据某个行政区下所有小区进行施工统计（柱状图）
-     * */
+     */
     @GetMapping("selectByDistrictStatistics")
-    public R<Map<String, List<?>>> selectByDistrictStatistics(String district){
+    public R<Map<String, List<?>>> selectByDistrictStatistics(String district) {
         return R.ok(iZEngineeringCivilService.selectByDistrictStatistics(district));
     }
 
     /**
      * 查询民用工程列表
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:list")
+    //    @SaCheckPermission("zdsz:engineeringCivil:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringCivilVo> list(ZEngineeringCivilBo bo, PageQuery pageQuery) {
         return iZEngineeringCivilService.queryPageList(bo, pageQuery);
@@ -66,12 +66,29 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 导出民用工程列表
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:export")
+    //    @SaCheckPermission("zdsz:engineeringCivil:export")
     @Log(title = "民用工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringCivilBo bo, PageQuery pageQuery, HttpServletResponse response) {
-        List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportList(bo);
-        ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程", "excel/civilExcel.xlsx", response);
+        if ("indoor_engin".equals(bo.getEnginClassification())) {
+            List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportList(bo);
+            ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-室内", "excel/civilExcel.xlsx", response);
+        }else if ("courtyard".equals(bo.getEnginClassification())) {
+            // 庭院
+            List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportCcourtyardList(bo);
+            ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-庭院", "excel/CivilCourtyardExcel.xlsx", response);
+
+        }else if ("overhead".equals(bo.getEnginClassification())) {
+            // 架空
+            List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportOverheadList(bo);
+            ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-架空", "excel/CivilOverheadExcel.xlsx", response);
+
+        }else if ("bottom_leg".equals(bo.getEnginClassification())) {
+            // 低腿
+            List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportBottomLegList(bo);
+            ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-底腿", "excel/CivilBottLegExcel.xlsx", response);
+
+        }
     }
 
     /**
@@ -79,41 +96,41 @@ public class ZEngineeringCivilController extends BaseController {
      *
      * @param id 主键
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:query")
+    //    @SaCheckPermission("zdsz:engineeringCivil:query")
     @GetMapping("/{id}")
     public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZEngineeringCivilService.queryById(id));
     }
+
     /**
      * 获取民用工程详细信息
-     *
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:query")
+    //    @SaCheckPermission("zdsz:engineeringCivil:query")
     @PostMapping("/query")
     public R<ZEngineeringCivilVo> query(@RequestBody ZEngineeringCivilBo zEngineeringCivilBo) {
         return R.ok(iZEngineeringCivilService.queryByEntityBo(zEngineeringCivilBo));
     }
 
 
-
     /**
      * 可视化进度点击房间查历史
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:query")
+    //    @SaCheckPermission("zdsz:engineeringCivil:query")
     @PostMapping("/queryProcess")
-    public R<ZEngineeringCivilVo> queryProcess(@RequestBody Map<String,String> params) {
+    public R<ZEngineeringCivilVo> queryProcess(@RequestBody Map<String, String> params) {
         ZEngineeringCivilVo vo = iZEngineeringCivilService.queryProcess(params);
         return R.ok(vo);
     }
+
     /**
      * 获取民用工程节点信息
      *
      * @param id 主键
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:query")
+    //    @SaCheckPermission("zdsz:engineeringCivil:query")
     @GetMapping("/{id}/{type}")
     public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
-        return R.ok(iZEngineeringCivilService.query(id,type));
+        return R.ok(iZEngineeringCivilService.query(id, type));
     }
 
     /**
@@ -122,7 +139,7 @@ public class ZEngineeringCivilController extends BaseController {
 
     @Log(title = "民用工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-//    @SaCheckPermission("zdsz:engineeringCivil:add")
+    //    @SaCheckPermission("zdsz:engineeringCivil:add")
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
         return toAjax(iZEngineeringCivilService.insertByBo(bo));
@@ -131,7 +148,7 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 修改民用工程
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:edit")
+    //    @SaCheckPermission("zdsz:engineeringCivil:edit")
     @Log(title = "民用工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -144,31 +161,35 @@ public class ZEngineeringCivilController extends BaseController {
      *
      * @param ids 主键串
      */
-//    @SaCheckPermission("zdsz:engineeringCivil:remove")
+    //    @SaCheckPermission("zdsz:engineeringCivil:remove")
     @Log(title = "民用工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         return toAjax(iZEngineeringCivilService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
-   // @SaCheckPermission("zdsz:engineeringCivil:remove")
+
+    // @SaCheckPermission("zdsz:engineeringCivil:remove")
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @PostMapping("/getObtainRoomcCompletionInformationList")
     public R getObtainRoomcCompletionInformationList(@RequestBody ZEngineeringCivilBo zEngineeringCivilBo) {
         return R.ok(iZEngineeringCivilService.getObtainRoomcCompletionInformationList(zEngineeringCivilBo));
     }
-//    @SaCheckPermission("zdsz:engineeringCivil:export")
+
+    //    @SaCheckPermission("zdsz:engineeringCivil:export")
     @Log(title = "民用工程", businessType = BusinessType.EXPORT)
     @PostMapping("/getAreaCompletionInformationListexport")
-    public void getAreaCompletionInformationListexport(ZEngineeringCivilBo bo,  HttpServletResponse response) {
+    public void getAreaCompletionInformationListexport(ZEngineeringCivilBo bo, HttpServletResponse response) {
         List<areaStatusVo> list = iZEngineeringCivilService.getAreaCompletionInformationList2(bo);
         ExcelUtil.exportExcel(list, "进度统计", areaStatusVo.class, response);
     }
-   // @SaCheckPermission("zdsz:engineeringCivil:remove")
+
+    // @SaCheckPermission("zdsz:engineeringCivil:remove")
     @Log(title = "民用工程", businessType = BusinessType.DELETE)
     @GetMapping("/getAreaCompletionInformationList")
-    public TableDataInfo getAreaCompletionInformationList(ZEngineeringCivilBo bo,PageQuery pageQuery) {
-        return iZEngineeringCivilService.getAreaCompletionInformationList(bo,pageQuery);
+    public TableDataInfo getAreaCompletionInformationList(ZEngineeringCivilBo bo, PageQuery pageQuery) {
+        return iZEngineeringCivilService.getAreaCompletionInformationList(bo, pageQuery);
     }
+
     @Log(title = "民用工程", businessType = BusinessType.DELETE)
     @GetMapping("/getsumStatus")
     public R<?> getsumStatus(ZEngineeringCivilBo bo) {
@@ -177,47 +198,53 @@ public class ZEngineeringCivilController extends BaseController {
 
     /**
      * 批量审核
+     *
      * @param bo
      * @return
      */
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @PostMapping("/batchReview")
     public R BatchReview(@RequestBody ZEngineeringCivilBo bo, @RequestBody ZEngineeringNodeBo zEngineeringNodeBo) {
-        return R.ok(iZEngineeringCivilService.batchReview(bo,zEngineeringNodeBo));
+        return R.ok(iZEngineeringCivilService.batchReview(bo, zEngineeringNodeBo));
     }
 
     /**
      * 审核
+     *
      * @return
      */
     @Log(title = "通用审核", businessType = BusinessType.OTHER)
     @PostMapping("/Review")
-    public R Review( @RequestBody ZEngineeringReviewBo zEngineeringReviewBo) {
+    public R Review(@RequestBody ZEngineeringReviewBo zEngineeringReviewBo) {
         return R.ok(izEngineeringReviewService.insert(zEngineeringReviewBo));
     }
 
     /**
-     *民用审核
+     * 民用审核
+     *
      * @param zEngineeringReviewBo
      * @return
      */
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @PostMapping("/CivilReview")
-    public R Civilinsert( @RequestBody ZEngineeringReviewBo zEngineeringReviewBo,@RequestBody infoIdList infoIdList) {
-        return R.ok(iZEngineeringCivilService.Civilinsert(zEngineeringReviewBo,infoIdList));
+    public R Civilinsert(@RequestBody ZEngineeringReviewBo zEngineeringReviewBo, @RequestBody infoIdList infoIdList) {
+        return R.ok(iZEngineeringCivilService.Civilinsert(zEngineeringReviewBo, infoIdList));
     }
+
     /**
-     *民用获取各个节点状态
+     * 民用获取各个节点状态
+     *
      * @return
      */
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @PostMapping("/getRivewStatus/{Id}")
-    public R getRivewStatus( @PathVariable("Id")  String Id) {
+    public R getRivewStatus(@PathVariable("Id") String Id) {
         return R.ok(iZEngineeringCivilService.getRivewStatus(Id));
     }
+
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @PostMapping("/batchNode")
-    public R batchNode( @RequestBody  ZEngineeringCivilBo bo) {
+    public R batchNode(@RequestBody ZEngineeringCivilBo bo) {
         return R.ok(iZEngineeringCivilService.batchNode(bo));
     }
 }

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

@@ -65,6 +65,7 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "单元")
     private String unitId;
     private String unitName;
+    private String remarkd;
 
     /**
      * 房间id

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

@@ -43,6 +43,8 @@ public class ZEngineeringCivilExportVos extends BaseEntity implements Serializab
 
     private String completionStatus;
 
+
+    // 室内
     private String corrosionLevel;
     private String LGmaterialQuality;
     private String LGspecifications;
@@ -58,4 +60,27 @@ public class ZEngineeringCivilExportVos extends BaseEntity implements Serializab
     private String FGspecifications;
     private String FGnumber;
 
+
+    // 庭院
+    private String kwq;
+    private String kwh;
+    private String hk;
+    private String ht;
+    private String ybgc;
+    private String XGmaterialQuality;
+    private String XGspecifications;
+    private String XGnumber;
+
+    // 架空
+    private String cxsy;
+    private String dm;
+    private String JKmaterialQuality;
+    private String JKspecifications;
+    private String JKnumber;
+
+    // 底腿
+    private String sgwz;
+    private String jtwz;
+
+
 }

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

@@ -34,6 +34,9 @@ public interface IZEngineeringCivilService {
      */
     TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
     List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo);
+    List<ZEngineeringCivilExportVos> exportCcourtyardList(ZEngineeringCivilBo bo);
+    List<ZEngineeringCivilExportVos> exportOverheadList(ZEngineeringCivilBo bo);
+    List<ZEngineeringCivilExportVos> exportBottomLegList(ZEngineeringCivilBo bo);
 
     /**
      * 查询民用工程列表

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

@@ -272,14 +272,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
                 if ("打孔".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
-                if ("立杠".equals(zEngineeringCivilExportVo.getType())){
+                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())){
+                if ("表后管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBHGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setBHGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     zEngineeringCivilExportVos.setBHGnumber(zEngineeringCivilExportVo.getNumber().toString());
@@ -288,7 +288,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                 if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
-                if ("阀管".equals(zEngineeringCivilExportVo.getType())){
+                if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setVisitType(zEngineeringCivilExportVo.getVisitType());
                     zEngineeringCivilExportVos.setFGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setFGspecifications(zEngineeringCivilExportVo.getSpecifications());
@@ -303,6 +303,242 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return arrayList;
     }
 
+    @Override
+    public List<ZEngineeringCivilExportVos> exportBottomLegList(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());
+//                remarkd
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJtwz())){
+                    zEngineeringCivilExportVos.setJtwz("");
+                }
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getSgwz())){
+                    zEngineeringCivilExportVos.setSgwz("");
+                }
+                if ("".equals(zEngineeringCivilExportVos.getJtwz())){
+                    zEngineeringCivilExportVos.setJtwz(zEngineeringCivilExportVo.getRemarkd());
+                }else {
+                    zEngineeringCivilExportVos.setJtwz(zEngineeringCivilExportVos.getJtwz()+"/"+zEngineeringCivilExportVo.getRemarkd());
+                }
+                if ("".equals(zEngineeringCivilExportVos.getSgwz())){
+                    zEngineeringCivilExportVos.setSgwz(zEngineeringCivilExportVo.getConstructAddre());
+                }else {
+                    zEngineeringCivilExportVos.setSgwz(zEngineeringCivilExportVos.getSgwz()+"/"+zEngineeringCivilExportVo.getConstructAddre());
+                }
+            }
+            arrayList.add(zEngineeringCivilExportVos);
+        }
+
+
+        return arrayList;
+    }
+
+    @Override
+    public List<ZEngineeringCivilExportVos> exportOverheadList(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();
+            zEngineeringCivilExportVos.setCxsy("×");
+            zEngineeringCivilExportVos.setDm("×");
+            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(zEngineeringCivilExportVos.getCxsy()) && "除锈刷油".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setCxsy("√");
+                if ("×".equals(zEngineeringCivilExportVos.getDm()) && "打磨".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setDm("√");
+                if ("全貌照片".equals(zEngineeringCivilExportVo.getType())){
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKmaterialQuality())){
+                        zEngineeringCivilExportVos.setJKmaterialQuality("");
+                    }
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKspecifications())){
+                        zEngineeringCivilExportVos.setJKspecifications("");
+                    }
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKnumber())){
+                        zEngineeringCivilExportVos.setJKnumber("");
+                    }
+                    if ("".equals(zEngineeringCivilExportVos.getJKmaterialQuality()))
+                        zEngineeringCivilExportVos.setJKmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                    else
+                        zEngineeringCivilExportVos.setJKmaterialQuality(zEngineeringCivilExportVos.getJKmaterialQuality() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+
+                    if ("".equals(zEngineeringCivilExportVos.getJKspecifications()))
+                        zEngineeringCivilExportVos.setJKspecifications(zEngineeringCivilExportVo.getMaterialQuality());
+                    else
+                        zEngineeringCivilExportVos.setJKspecifications(zEngineeringCivilExportVos.getJKspecifications() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+
+                    if ("".equals(zEngineeringCivilExportVos.getJKnumber()))
+                        zEngineeringCivilExportVos.setJKnumber(zEngineeringCivilExportVo.getMaterialQuality());
+                    else
+                        zEngineeringCivilExportVos.setJKnumber(zEngineeringCivilExportVos.getJKnumber() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+
+                }
+            }
+            arrayList.add(zEngineeringCivilExportVos);
+        }
+
+
+        return arrayList;
+    }
+
+    @Override
+    public List<ZEngineeringCivilExportVos> exportCcourtyardList(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();
+            zEngineeringCivilExportVos.setKwq("×");
+            zEngineeringCivilExportVos.setKwh("×");
+            zEngineeringCivilExportVos.setHk("×");
+            zEngineeringCivilExportVos.setHt("×");
+            zEngineeringCivilExportVos.setYbgc("×");
+            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(zEngineeringCivilExportVos.getKwq()) && "开挖前".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setKwq("√");
+                if ("×".equals(zEngineeringCivilExportVos.getKwh()) && "开挖后".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setKwh("√");
+                if ("×".equals(zEngineeringCivilExportVos.getHk()) && "焊口".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setHk("√");
+                if ("×".equals(zEngineeringCivilExportVos.getHt()) && "回填".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setHt("√");
+                if ("×".equals(zEngineeringCivilExportVos.getYbgc()) && "隐蔽工程".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setYbgc("√");
+                if ("下沟".equals(zEngineeringCivilExportVo.getType())) {
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getXGmaterialQuality())) {
+                        zEngineeringCivilExportVos.setXGmaterialQuality("");
+                    }
+                    if ("".equals(zEngineeringCivilExportVos.getXGmaterialQuality()))
+                        zEngineeringCivilExportVos.setXGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                    else
+                        zEngineeringCivilExportVos.setXGmaterialQuality(zEngineeringCivilExportVos.getXGmaterialQuality() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getXGspecifications())) {
+                        zEngineeringCivilExportVos.setXGspecifications("");
+                    }
+                    if ("".equals(zEngineeringCivilExportVos.getXGspecifications()))
+                        zEngineeringCivilExportVos.setXGspecifications(zEngineeringCivilExportVo.getSpecifications());
+                    else
+                        zEngineeringCivilExportVos.setXGspecifications(zEngineeringCivilExportVos.getXGspecifications() + "/" + zEngineeringCivilExportVo.getSpecifications());
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber())) {
+                        zEngineeringCivilExportVo.setNumber(0.0);
+                    }
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getXGnumber())) {
+                        zEngineeringCivilExportVos.setXGnumber("");
+                    }
+                    if ("".equals(zEngineeringCivilExportVos.getXGnumber())) {
+                        zEngineeringCivilExportVos.setXGnumber(zEngineeringCivilExportVo.getNumber().toString());
+                    } else {
+                        zEngineeringCivilExportVos.setXGnumber(zEngineeringCivilExportVos.getXGnumber() + "/" + zEngineeringCivilExportVo.getNumber().toString());
+                    }
+                }
+
+            }
+            arrayList.add(zEngineeringCivilExportVos);
+        }
+
+
+        return arrayList;
+    }
+
     /**
      * 查询民用工程列表
      */
@@ -701,13 +937,13 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
     public int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList) {
         ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
-        infoIdList.getDelInfoIdList().stream().forEach(item->{
-            ZEngineeringInfoBo zEngineeringInfoBo=new ZEngineeringInfoBo();
+        infoIdList.getDelInfoIdList().stream().forEach(item -> {
+            ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
             zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
             zEngineeringInfoBo.setId(item);
             izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
         });
-        infoIdList.getInfoIdList().stream().forEach(item->{
+        infoIdList.getInfoIdList().stream().forEach(item -> {
             item.setState("1");
             izEngineeringInfoService.update(item);
         });

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

@@ -328,7 +328,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.number,
         c.update_info_time as updateInfoTime,
         c.create_by as createBy,
-        c.remark
+        c.remark,
+        d.remark as remarkd
         FROM
             z_engineering_civil a
         LEFT JOIN z_engineering_node b ON a.id = b.civli_id
@@ -409,7 +410,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.number,
             c.update_info_time as updateInfoTime,
             c.create_by as createBy,
-            c.remark
+            c.remark,
+            d.remark as remarkd
             FROM
             z_engineering_civil a
             LEFT JOIN z_engineering_node_${name} b ON a.id = b.civli_id