Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringGasOpeningBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.service.IZEngineeringGasOpeningService;
@@ -117,24 +118,4 @@ public class ZEngineeringGasOpeningController extends BaseController {
         return R.ok(iZEngineeringGasOpeningService.query(id, "带气封堵施工"));
     }
 
-    /**
-     * 开栓施工根据工程类型查询工程名称
-     */
-    @GetMapping("/queryNameByType")
-//    @SaCheckPermission("zdsz:engineeringIndustry:type")
-    public R<List<ZEngineeringIndustryTypeVo>> queryNameByType(ZEngineeringGasOpeningBo bo) {
-        return R.ok(iZEngineeringGasOpeningService.queryNameByType(bo));
-    }
-
-    /**
-     * 开栓施工修改工程
-     */
-    @PutMapping("/updateNodeByBo")
-    @Log(title = "开栓施工", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-//    @SaCheckPermission("zdsz:engineeringIndustry:removeNode")
-    public R<Void> updateNodeByBo(@Validated(EditGroup.class) @RequestBody ZEngineeringGasOpeningBo bo) {
-        return toAjax(iZEngineeringGasOpeningService.updateNodeByBo(bo));
-    }
-
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.zdsz;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -14,8 +15,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -39,6 +43,11 @@ public class ZEngineeringIndustryController extends BaseController {
 
     private final IZEngineeringIndustryService iZEngineeringIndustryService;
 
+    @GetMapping("getByUserList")
+    public R<?> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery){
+        return R.ok(iZEngineeringIndustryService.getByUserList(type,enginName,enginType,enginProcedure,enginStatus, pageQuery));
+    }
+
     /**
      * 查询工业工程|市政工程列表
      */
@@ -82,6 +91,10 @@ public class ZEngineeringIndustryController extends BaseController {
         return toAjax(iZEngineeringIndustryService.insertByBo(bo));
     }
 
+    @GetMapping("query/{id}/{type}")
+    public R<ZEngineeringIndustryVo> querys(@NotNull(message = "主键不能为空") @PathVariable String id) {
+        return R.ok(iZEngineeringIndustryService.query(id));
+    }
     /**
      * 修改工业工程|市政工程
      */

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

@@ -1,17 +1,20 @@
 package com.ruoyi.web.controller.zdsz;
 
+import java.io.File;
 import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.common.utils.file.FolderToZipUtil;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -112,7 +115,38 @@ public class ZEngineeringPipeJackingController extends BaseController {
         bo.setCreateTime(new Date());
         return toAjax(iZEngineeringPipeJackingService.insertByBo(bo));
     }
+    @Value("${filePath}")
+    private String filePath;
 
+    @GetMapping(value = "/downloadZip/{type}/{name}")
+    public void downloadZip(@PathVariable String type,@PathVariable String name,HttpServletResponse response) {
+//        File file = new File(zipPath);//创建指定目录和文件名称的文件对象
+        try {
+            // 创建最外层文件夹
+            byte[] fileNameBytes = filePath.getBytes("UTF-8");
+            // 使用UTF-8编码创建文件
+            File file = new File(new String(fileNameBytes, "UTF-8"));
+            if (!file.exists()) {
+                file.mkdirs();
+            }
+            byte[] typeFileNameBytes = (file.getPath() + "/" + type).getBytes("UTF-8");
+            // 使用UTF-8编码创建文件
+            File typeFile = new File(new String(typeFileNameBytes, "UTF-8"));
+            if (!typeFile.exists()) {
+                typeFile.mkdirs();
+            }
+            byte[] enginNameFileNameBytes = (typeFile.getPath() + "/" + name).getBytes("UTF-8");
+            // 使用UTF-8编码创建文件
+            File enginNameFile = new File(new String(enginNameFileNameBytes, "UTF-8"));
+            if (!enginNameFile.exists()) {
+                enginNameFile.mkdirs();
+            }
+            System.out.println(enginNameFile.getPath());
+            FolderToZipUtil.zip(enginNameFile.getPath(),name,response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
     /**
      * 新增顶管工程App
      */

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FolderToZipUtil.java

@@ -0,0 +1,87 @@
+package com.ruoyi.common.utils.file;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @program: microfront-server
+ * @description: 文件夹压缩为zip文件
+ * @author: zhangy
+ * @create: 2021-04-01 09:43
+ */
+public class FolderToZipUtil {
+
+    public static void zip(String sourceFileName, String objName,HttpServletResponse response){
+        ZipOutputStream out = null;
+        BufferedOutputStream bos = null;
+        try {
+            //将zip以流的形式输出到前台
+            response.setHeader("content-type", "application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            // 设置浏览器响应头对应的Content-disposition
+            //参数中 testZip 为压缩包文件名，尾部的.zip 为文件后缀
+            response.setHeader("Content-disposition",
+                    "attachment;filename=" + new String(objName.getBytes("gbk"), "iso8859-1")+".zip");
+            //创建zip输出流
+            out = new ZipOutputStream(response.getOutputStream());
+            //创建缓冲输出流
+            bos = new BufferedOutputStream(out);
+            File sourceFile = new File(sourceFileName);
+            //调用压缩函数
+            compress(out, bos, sourceFile, sourceFile.getName());
+            out.flush();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally {
+            IOCloseUtil.close(bos, out);
+        }
+    }
+
+    /**
+     * 文件压缩
+     * @param out
+     * @param bos
+     * @param sourceFile
+     * @param base
+     */
+    public static void compress(ZipOutputStream out, BufferedOutputStream bos, File sourceFile, String base){
+        FileInputStream fos = null;
+        BufferedInputStream bis = null;
+        try {
+            //如果路径为目录（文件夹）
+            if (sourceFile.isDirectory()) {
+                //取出文件夹中的文件（或子文件夹）
+                File[] flist = sourceFile.listFiles();
+                if (flist.length == 0) {//如果文件夹为空，则只需在目的地zip文件中写入一个目录进入点
+                    out.putNextEntry(new ZipEntry(base + "/"));
+                } else {//如果文件夹不为空，则递归调用compress，文件夹中的每一个文件（或文件夹）进行压缩
+                    for (int i = 0; i < flist.length; i++) {
+                        compress(out, bos, flist[i], base + "/" + flist[i].getName());
+                    }
+                }
+            } else {//如果不是目录（文件夹），即为文件，则先写入目录进入点，之后将文件写入zip文件中
+                out.putNextEntry(new ZipEntry(base));
+                fos = new FileInputStream(sourceFile);
+                bis = new BufferedInputStream(fos);
+
+                int tag;
+                //将源文件写入到zip文件中
+                while ((tag = bis.read()) != -1) {
+                    out.write(tag);
+                }
+                bis.close();
+                fos.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally {
+            IOCloseUtil.close(bis,fos);
+        }
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/IOCloseUtil.java

@@ -0,0 +1,39 @@
+package com.ruoyi.common.utils.file;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * @program: microfront-server
+ * @description: IO流关闭工具Utils
+ * @author: zhangy
+ * @create: 2021-04-01 09:28
+ */
+public class IOCloseUtil {
+
+    /**
+     *   IO流关闭工具类
+     */
+    public static void close(Closeable... io) {
+        for (Closeable temp : io) {
+            try {
+                if (null != temp)
+                    temp.close();
+            } catch (IOException e) {
+                System.out.println("" + e.getMessage());
+            }
+        }
+    }
+
+    public static <T extends Closeable> void closeAll(T... io) {
+        for (Closeable temp : io) {
+            try {
+                if (null != temp)
+                    temp.close();
+            } catch (IOException e) {
+                System.out.println("" + e.getMessage());
+            }
+        }
+
+    }
+}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringGasOpening.java

@@ -30,6 +30,7 @@ public class ZEngineeringGasOpening extends BaseEntity {
      */
     @TableId(value = "id")
     private String id;
+    private String state;
     /**
      * 工程类型
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringGasOpeningBo.java

@@ -25,8 +25,9 @@ public class ZEngineeringGasOpeningBo extends BaseEntity {
     private String id;
 
     /**
-     * 工程名称
+     * 开栓状态
      */
+    private String state;
     private String enginName;
 
     /**
@@ -162,6 +163,11 @@ public class ZEngineeringGasOpeningBo extends BaseEntity {
     private ZEngineeringNodeBo zEngineeringNodeBo;
 
     /**
+     * 手机端用审核状态传值
+     */
+    private String completionStatus;
+
+    /**
      * 附件
      */
     private List<ZFileBo> files;

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

@@ -27,6 +27,8 @@ public class ZEngineeringGasOpeningVo extends BaseEntity {
     @ExcelProperty(value = "")
     private String id;
 
+    private String state;
+
     /**
      * 工程类型
      */
@@ -99,6 +101,7 @@ public class ZEngineeringGasOpeningVo extends BaseEntity {
      */
     @ExcelProperty(value = "进气方向")
     private String gasMeterDirection;
+    private String gasMeterDirectionName;
     /**
      * 型号
      */
@@ -119,6 +122,7 @@ public class ZEngineeringGasOpeningVo extends BaseEntity {
      */
     @ExcelProperty(value = "阀管改造类型")
     private String gasChangeType;
+    private String gasChangeTypeName;
     /**
      * 是否使用防风圈
      */

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

@@ -17,5 +17,5 @@ public interface ZEngineeringGasOpeningMapper extends BaseMapperPlus<ZEngineerin
 
     Page<ZEngineeringGasOpeningVo> queryPageList(@Param("p") ZEngineeringGasOpeningBo bo, @Param("pa") Page<?> page, @Param("page") Integer pages, @Param("size") Integer size);
 
-
+    ZEngineeringGasOpeningVo queryVoById(String id);
 }

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

@@ -1,8 +1,13 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 工业工程|市政工程Mapper接口
@@ -12,4 +17,7 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
  */
 public interface ZEngineeringIndustryMapper extends BaseMapperPlus<ZEngineeringIndustryMapper, ZEngineeringIndustry, ZEngineeringIndustryVo> {
 
+    Page<Map<String,Object>> getByUserList(@Param("names") List DateList, @Param("by")String name, @Param("type")String type,@Param("szAndGy")String szAndGy,@Param("pa") Page<?> page);
+    List<Map<String,String>> getReviewStatusByNodeId(@Param("id") String id);
+
 }

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

@@ -50,6 +50,4 @@ public interface IZEngineeringGasOpeningService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     ZEngineeringGasOpeningVo query(String id, String type);
-
-    List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringGasOpeningBo bo);
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 工业工程|市政工程Service接口
@@ -17,6 +18,8 @@ import java.util.List;
  */
 public interface IZEngineeringIndustryService {
 
+    TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery);
+
     /**
      * 查询工业工程|市政工程
      */
@@ -51,5 +54,6 @@ public interface IZEngineeringIndustryService {
 
     ZEngineeringIndustryVo query(String id, String type);
 
+    ZEngineeringIndustryVo query(String id);
     List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo);
 }

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

@@ -333,13 +333,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
                         if (!typeFile.exists()) {
                             typeFile.mkdirs();
                         }
-                        byte[] idNameBytes = (typeFile.getPath() + "/" + objInfo.get("id")).getBytes("UTF-8");
-                        // 使用UTF-8编码创建文件
-                        File idFile = new File(new String(idNameBytes, "UTF-8"));
-                        if (!idFile.exists()) {
-                            idFile.mkdirs();
-                        }
-                        byte[] enginNameFileNameBytes = (idFile.getPath() + "/" + objInfo.get("engin_name")).getBytes("UTF-8");
+                        byte[] enginNameFileNameBytes = (typeFile.getPath() + "/" + objInfo.get("engin_name")).getBytes("UTF-8");
                         // 使用UTF-8编码创建文件
                         File enginNameFile = new File(new String(enginNameFileNameBytes, "UTF-8"));
                         if (!enginNameFile.exists()) {

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringGasOpening;
 import com.ruoyi.zdsz.domain.bo.*;
@@ -57,20 +60,20 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
      */
     @Override
     public ZEngineeringGasOpeningVo queryById(String id) {
-        ZEngineeringGasOpeningVo zEngineeringGasOpeningVo = baseMapper.selectVoById(id);
+        ZEngineeringGasOpeningVo zEngineeringGasOpeningVo = baseMapper.queryVoById(id);
         ZEngiineeringPhotoBo photoBo = new ZEngiineeringPhotoBo();
         photoBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
         photoBo.setParentId(zEngineeringGasOpeningVo.getId());
         List<ZEngiineeringPhotoVo> photoVoList = photoService.queryList(photoBo);
-        zEngineeringGasOpeningVo.setGasCylinderPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasCylinderPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setPressureTestPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("pressureTestPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setGasMeterPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasMeterPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setRearPipePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("rearPipePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setGasChangePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasChangePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setSoftPipePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("softPipePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setWindproofCirclePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("windproofCirclePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setGasEnvironmentPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasEnvironmentPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
-        zEngineeringGasOpeningVo.setReceiptFormPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("receiptFormPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasCylinderPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasCylinderPic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasCylinderPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setPressureTestPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("pressureTestPic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("pressureTestPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasMeterPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasMeterPic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasMeterPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setRearPipePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("rearPipePic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("rearPipePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasChangePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasChangePic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasChangePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setSoftPipePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("softPipePic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("softPipePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setWindproofCirclePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("windproofCirclePic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("windproofCirclePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasEnvironmentPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasEnvironmentPic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasEnvironmentPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setReceiptFormPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("receiptFormPic")==null?new ArrayList<>():photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("receiptFormPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
         return zEngineeringGasOpeningVo;
     }
 
@@ -129,6 +132,11 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(ZEngineeringGasOpeningBo bo) {
+        LambdaQueryWrapper<ZEngineeringGasOpening> lqw = buildQueryWrapper(bo);
+        List<ZEngineeringGasOpeningVo> list = baseMapper.selectVoList(lqw);
+        if(list.size() > 0){
+            throw new ServiceException("当前房间已开栓，不能重复提交！");
+        }
         ZEngineeringGasOpening add = BeanUtil.toBean(bo, ZEngineeringGasOpening.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
@@ -166,11 +174,11 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
             batchInsertPic(bo.getGasEnvironmentPic(), bo.getId(), "gasEnvironmentPic");
             batchInsertPic(bo.getReceiptFormPic(), bo.getId(), "receiptFormPic");
         }
-        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
-            bo.getzEngineeringNodeBo().setCivliId(add.getId());
-            bo.getzEngineeringNodeBo().setCreateTime(new Date());
-            izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
-        }
+//        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+//            bo.getzEngineeringNodeBo().setCivliId(add.getId());
+//            bo.getzEngineeringNodeBo().setCreateTime(new Date());
+//            izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+//        }
         return flag;
     }
 
@@ -183,69 +191,19 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
         ZEngineeringGasOpening update = BeanUtil.toBean(bo, ZEngineeringGasOpening.class);
         validEntityBeforeSave(update);
         boolean flag = baseMapper.updateById(update) > 0;
-        if (flag) {
-            List<ZEngiineeringPhoto> list = new ArrayList<>();
-            // 查询数据库中已存在的文件列表
-            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
-            zEngiineeringPhotoBo.setParentId(update.getId());
-            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
-            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
-            // 插入前端传来的新文件
-            if (!ObjectUtils.isEmpty(bo.getFiles())) {
-                for (ZFileBo pic : bo.getFiles()) {
-                    if (!existingPhotos.contains(pic.getUrl())) {
-                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
-                        newPhoto.setParentId(bo.getId());
-                        newPhoto.setPicUrl(pic.getUrl());
-                        newPhoto.setFileName(pic.getName());
-                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
-                        newPhoto.setCreateTime(bo.getCreateTime());
-                        newPhoto.setUpdateTime(new Date());
-                        list.add(newPhoto);
-                    }
-                }
-                // 删除数据库中多余的文件
-                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
-                if (!photosToDelete.isEmpty()) {
-                    photosToDelete.forEach(item -> {
-                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
-                        zEngiineeringPhoto.setPicUrl(item);
-                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-                        photoService.deleteWithValid(zEngiineeringPhoto);
-                    });
-                }
-                // 批量插入新图片
-                if (!list.isEmpty()) {
-                    photoService.insertBatch(list);
-                }
-            }
-            batchUpdatePic(bo.getGasCylinderPic(), bo.getId(), "gasCylinderPic", bo.getCreateTime());
-            batchUpdatePic(bo.getPressureTestPic(), bo.getId(), "pressureTestPic", bo.getCreateTime());
-            batchUpdatePic(bo.getGasMeterPic(), bo.getId(), "gasMeterPic", bo.getCreateTime());
-            batchUpdatePic(bo.getRearPipePic(), bo.getId(), "rearPipePic", bo.getCreateTime());
-            batchUpdatePic(bo.getGasChangePic(), bo.getId(), "gasChangePic", bo.getCreateTime());
-            batchUpdatePic(bo.getSoftPipePic(), bo.getId(), "softPipePic", bo.getCreateTime());
-            batchUpdatePic(bo.getWindproofCirclePic(), bo.getId(), "windproofCirclePic", bo.getCreateTime());
-            batchUpdatePic(bo.getGasEnvironmentPic(), bo.getId(), "gasEnvironmentPic", bo.getCreateTime());
-            batchUpdatePic(bo.getReceiptFormPic(), bo.getId(), "receiptFormPic", bo.getCreateTime());
-        }
-        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
-//        bo.getzEngineeringNodeBo().setType(bo.getType());
-        bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
-        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(update.getId());
-//        zEngineeringNodeBo.setType(bo.getType());
-//        zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType()); // zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType());
-        zEngineeringNodeBo.setType("开栓施工"); // zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType());
-        zEngineeringNodeBo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
-        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
-        if (!ObjectUtils.isEmpty(query)) {
-            bo.getzEngineeringNodeBo().setId(query.getId());
-        }
-        bo.getzEngineeringNodeBo().setType("开栓施工");
-        bo.getzEngineeringNodeBo().setCreateTime(zEngineeringNodeBo.getCreateTime());
-        izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
-        System.out.println("izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());");
+        ZEngineeringInfoBo photoBo = new ZEngineeringInfoBo();
+        photoBo.setCreateTime(bo.getCreateTime());
+        photoBo.setId(bo.getId());
+        photoService.delete(photoBo);
+        batchInsertPic(bo.getGasCylinderPic(), bo.getId(), "gasCylinderPic");
+        batchInsertPic(bo.getPressureTestPic(), bo.getId(), "pressureTestPic");
+        batchInsertPic(bo.getGasMeterPic(), bo.getId(), "gasMeterPic");
+        batchInsertPic(bo.getRearPipePic(), bo.getId(), "rearPipePic");
+        batchInsertPic(bo.getGasChangePic(), bo.getId(), "gasChangePic");
+        batchInsertPic(bo.getSoftPipePic(), bo.getId(), "softPipePic");
+        batchInsertPic(bo.getWindproofCirclePic(), bo.getId(), "windproofCirclePic");
+        batchInsertPic(bo.getGasEnvironmentPic(), bo.getId(), "gasEnvironmentPic");
+        batchInsertPic(bo.getReceiptFormPic(), bo.getId(), "receiptFormPic");
         return flag;
     }
 
@@ -426,31 +384,4 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
         return zEngineeringGasOpeningVo;
     }
 
-    @Override
-    public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringGasOpeningBo bo) {
-        LambdaQueryWrapper<ZEngineeringGasOpening> zEngineeringGasOpeningBoLambdaQueryWrapper = buildListByType(bo);
-        zEngineeringGasOpeningBoLambdaQueryWrapper.orderByDesc(ZEngineeringGasOpening::getCreateTime);
-//        List<ZEngineeringGasOpening> zEngineeringAirWalVos = baseMapper.selectList(zEngineeringGasOpeningBoLambdaQueryWrapper);
-//        List<ZEngineeringIndustryTypeVo> zEngineeringAirWalTypeVos = zEngineeringAirWalVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
-//        return zEngineeringAirWalTypeVos;
-        return new ArrayList<ZEngineeringIndustryTypeVo>();
-    }
-
-    private LambdaQueryWrapper<ZEngineeringGasOpening> buildListByType(ZEngineeringGasOpeningBo bo) {
-
-        LambdaQueryWrapper<ZEngineeringGasOpening> queryWrapper = new LambdaQueryWrapper<ZEngineeringGasOpening>();
-        queryWrapper.orderByDesc(ZEngineeringGasOpening::getCreateTime);
-//        queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
-//        queryWrapper.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
-//        if (!"null".equals(bo.getEnginClassification())) {
-//            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
-//        }
-        if (!"null".equals(bo.getEnginName())) {
-            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGasOpening::getEnginName, bo.getEnginName());
-        }
-
-        return queryWrapper;
-    }
-
-
 }

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

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
@@ -16,11 +19,14 @@ import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -28,6 +34,9 @@ import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,6 +62,172 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Resource
     private IZEngiineeringPhotoService photoService;
 
+    @Autowired
+    private ZEngineeringCivilMapper zEngineeringCivilMapper;
+
+    @Override
+    public TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery) {
+        Page<T> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        String leftJoin = null;
+        String szAndGy = null;
+        if ("1".equals(type)){
+            leftJoin = "z_engineering_pipe_jacking"; // 顶管
+        }
+        else if ("2".equals(type)){
+            leftJoin = "z_engineering_infrastructure"; // 基建
+        }
+        else if ("3".equals(type)){
+            leftJoin = "z_engineering_dangerous"; // 危险工程
+        }
+        else if ("4".equals(type)){
+            leftJoin = "z_engineering_industry"; // 市政工程
+            szAndGy = "gy";
+        }
+        else if ("5".equals(type)){
+            leftJoin = "z_engineering_industry"; // 工业工程
+            szAndGy = "sz";
+        }
+        else if ("6".equals(type)){
+            leftJoin = "z_engineering_air_wall"; // 工业工程
+        }
+        LinkedList<String> list = zEngineeringCivilMapper.getTableNames("z_engineering_info");
+        List DateList = new ArrayList();
+        list.removeLast();
+        list.stream().forEach(item -> {
+            DateList.add(item.substring(item.indexOf("2")));
+        });
+        String username = LoginHelper.getUsername();
+        Page<Map<String, Object>> listPage = baseMapper.getByUserList(DateList, username, leftJoin, szAndGy, page);
+
+        if ("1".equals(type)){ // 顶管
+            listPage.getRecords().forEach(item -> {
+
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                MonthTableNameHandler.setData(date);
+
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
+                List<SysDictData> municipalEngineeringNode = sysDictMap.get("pipe_jack");
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    // "municipal_engineering_node";
+                    ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                    ite.put("reviewStatus", str);
+                });
+                municipalEngineeringNode.forEach(ite -> {
+                    String dictLabel = ite.getDictLabel();
+                    List<Map<String, String>> type1 = mapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
+                    if (type1.size() == 0) {
+                        HashMap<String, String> objectObjectHashMap = new HashMap<>();
+                        objectObjectHashMap.put("reviewStatus","未审核");
+                        objectObjectHashMap.put("type",dictLabel);
+                        mapList.add(objectObjectHashMap);
+                    }
+                });
+                item.put("status",mapList);
+                MonthTableNameHandler.removeData();
+            });
+        }
+        else if ("2".equals(type)){ // 基建
+            listPage.getRecords().forEach(item -> {
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+                MonthTableNameHandler.setData(date);
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
+                List<SysDictData> municipalEngineeringNode = sysDictMap.get("engineering_infrastructure");
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    // "municipal_engineering_node";
+                    ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                    ite.put("reviewStatus", str);
+                });
+                municipalEngineeringNode.forEach(ite -> {
+                    String dictLabel = ite.getDictLabel();
+                    List<Map<String, String>> type1 = mapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
+                    if (type1.size() == 0) {
+                        HashMap<String, String> objectObjectHashMap = new HashMap<>();
+                        objectObjectHashMap.put("reviewStatus","未审核");
+                        objectObjectHashMap.put("type",dictLabel);
+                        mapList.add(objectObjectHashMap);
+                    }
+                });
+                item.put("status",mapList);
+                MonthTableNameHandler.removeData();
+            });
+        }
+        else if ("3".equals(type)){ // 危险工程
+            listPage.getRecords().forEach(item -> {
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+;
+                MonthTableNameHandler.setData(date);
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    ite.put("reviewStatus", str);
+                });
+                item.put("status",mapList);
+                MonthTableNameHandler.removeData();
+            });
+        }
+        else if ("4".equals(type)){ // 市政工程
+            listPage.getRecords().forEach(item -> {
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+;
+                MonthTableNameHandler.setData(date);
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
+                List<SysDictData> municipalEngineeringNode = sysDictMap.get("municipal_engineering_node");
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    // "municipal_engineering_node";
+                    ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                    ite.put("reviewStatus", str);
+                });
+                municipalEngineeringNode.forEach(ite -> {
+                    String dictLabel = ite.getDictLabel();
+                    List<Map<String, String>> type1 = mapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
+                    if (type1.size() == 0) {
+                        HashMap<String, String> objectObjectHashMap = new HashMap<>();
+                        objectObjectHashMap.put("reviewStatus","未审核");
+                        objectObjectHashMap.put("type",dictLabel);
+                        mapList.add(objectObjectHashMap);
+                    }
+                });
+                item.put("status",mapList);
+                MonthTableNameHandler.removeData();
+            });
+        }
+        else if ("5".equals(type)){ // 工业工程
+            listPage.getRecords().forEach(item -> {
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+;
+                MonthTableNameHandler.setData(date);
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    ite.put("reviewStatus", str);
+                });
+                item.put("status",mapList);
+            });
+            MonthTableNameHandler.removeData();
+        }
+        else if ("6".equals(type)){ // 工业工程
+            listPage.getRecords().forEach(item -> {
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+;
+                MonthTableNameHandler.setData(date);
+                List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
+                mapList.forEach(ite -> {
+                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    ite.put("reviewStatus", str);
+                });
+                item.put("status",mapList);
+            });
+            MonthTableNameHandler.removeData();
+        }
+        return TableDataInfo.build(listPage);
+    }
+
     /**
      * 查询工业工程|市政工程
      */
@@ -439,6 +614,16 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     @Override
+    public ZEngineeringIndustryVo query(String id) {
+        ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
+        zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringIndustryVo;
+    }
+
+    @Override
     public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo) {
         LambdaQueryWrapper<ZEngineeringIndustry> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
         zEngineeringIndustryBoLambdaQueryWrapper.orderByDesc(ZEngineeringIndustry::getCreateTime);

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

@@ -136,7 +136,12 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean insertByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
-
+        LambdaQueryWrapper<ZEngineeringPipeJacking> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(StringUtils.isNotEmpty(bo.getEnginName()),ZEngineeringPipeJacking::getEnginName,bo.getEnginName());
+        List<ZEngineeringPipeJacking> zEngineeringPipeJackings = baseMapper.selectList(wrapper);
+        if (zEngineeringPipeJackings.size() > 0){
+            return false;
+        }
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
@@ -227,6 +232,12 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     @Override
     @Transactional(rollbackFor=Exception.class)
     public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
+        LambdaQueryWrapper<ZEngineeringPipeJacking> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(StringUtils.isNotEmpty(bo.getEnginName()),ZEngineeringPipeJacking::getEnginName,bo.getEnginName());
+        List<ZEngineeringPipeJacking> zEngineeringPipeJackings = baseMapper.selectList(wrapper);
+        if (zEngineeringPipeJackings.size() > 0){
+            return false;
+        }
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         int i = baseMapper.updateById(update);

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

@@ -132,8 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by zc.create_time desc
     </select>
     <select id="getIsQualifiedString" resultType="java.lang.String" parameterType="java.lang.String">
-        SELECT
-            CASE is_qualified WHEN 'N' THEN 0 ELSE 1 END as isQualified
+        SELECT state
         FROM
             z_engineering_gas_opening
         WHERE

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

@@ -39,7 +39,6 @@
     <select id="getObjInfo" resultType="java.util.Map">
         SELECT
             IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name) AS engin_name,
-            IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.id),zed.id),zei.id),zepj.id) AS id,
             IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',IF(zein.type = '1','工业工程','市政工程')),'危险工程'),'基建工程'),'顶管工程') AS type
         FROM z_engineering_node_2024_05 ze
                  LEFT JOIN z_engineering_pipe_jacking zepj ON zepj.id = ze.civli_id

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

@@ -285,7 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             information_schema.TABLES
         WHERE
-            table_name like CONCAT(#{tableName},'%')
+            table_name like CONCAT(#{tableName},'%') GROUP BY table_name
     </select>
     <select id="getsumId" resultType="com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo">
         SELECT

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

@@ -13,6 +13,8 @@
             z.unit_id,
             z.house_id,
             e.dict_label AS districtName,
+            z.state,
+            z.create_time as createTime,
             if(a.name is null , '未知' ,a.NAME) AS areaName,
             if(b.name is null , '未知' ,b.NAME) AS buildingName,
             if(c.name is null , '未知' ,c.NAME) AS unitName,
@@ -43,7 +45,59 @@
         <if test="p.createBy != null and p.createBy != ''">
             and z.create_by = #{p.createBy}
         </if>
+        <if test="p.completionStatus != null and p.completionStatus != ''">
+            and z.state = #{p.completionStatus}
+        </if>
         order by z.update_info_time desc
     </select>
-
+    <select id="queryVoById" parameterType="java.lang.String" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo">
+        SELECT
+            z.id,
+            z.state,
+            z.engin_type AS engintype,
+            z.district,
+            z.area_id AS areaId,
+            z.building_id AS buildingId,
+            z.unit_id AS unitId,
+            z.house_id AS houseId,
+            z.is_anti_corrosion_paint AS isAntiCorrosionPaint,
+            z.is_vertical_bar_clamp AS isVerticalBarClamp,
+            z.vertical_bar_test AS verticalBarTest,
+            z.household_test AS householdTest,
+            z.gas_meter_number AS gasMeterNumber,
+            z.gas_meter_count AS gasMeterCount,
+            z.gas_meter_brand AS gasMeterBrand,
+            z.gas_meter_direction AS gasMeterDirection,
+            e1.dict_label AS gasMeterDirectionName,
+            z.gas_meter_type AS gasMeterType,
+            z.is_rear_pipe_clamp AS isRearPipeClamp,
+            z.is_gas_change_type AS isGasChangeType,
+            z.gas_change_type AS gasChangeType,
+            e2.dict_label AS gasChangeTypeName,
+            z.is_windproof_circle AS isWindproofCircle,
+            z.engin_name AS enginName,
+            z.version,
+            z.remark,
+            z.del_flag AS delFlag,
+            z.create_by AS createBy,
+            z.create_time AS createTime,
+            z.update_by AS updateBy,
+            z.update_time AS updateTime,
+            z.update_info_time AS updateInfoTime,
+            e.dict_label AS districtName,
+            if(a.name is null , '未知' ,a.NAME) AS areaName,
+            if(b.name is null , '未知' ,b.NAME) AS buildingName,
+            if(c.name is null , '未知' ,c.NAME) AS unitName,
+            if(d.name is null , '未知' ,d.NAME) AS houseName
+        FROM
+            z_engineering_gas_opening z
+                LEFT JOIN z_area a ON z.area_id = a.id
+                LEFT JOIN z_building b ON z.building_id = b.id
+                LEFT JOIN z_unit c ON z.unit_id = c.id
+                LEFT JOIN z_house d ON z.house_id = d.id
+                LEFT JOIN sys_dict_data e ON e.dict_value = z.district
+                LEFT JOIN sys_dict_data e1 ON e1.dict_value = z.gas_meter_direction
+                LEFT JOIN sys_dict_data e2 ON e2.dict_value = z.gas_change_type
+        where z.del_flag = 0 and z.id = #{id}
+    </select>
 </mapper>

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

@@ -26,5 +26,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getReviewStatusByNodeId" resultType="java.util.Map">
+        SELECT
+            en.type,
+            COALESCE(
+                    (SELECT er.review_status FROM z_engineering_review er WHERE er.eng_info_id = en.id AND er.del_flag = 0 ORDER BY er.update_info_time DESC LIMIT 1),
+        '2'
+    ) AS reviewStatus
+        FROM
+            z_engineering_node en
+        WHERE
+            en.civli_id = #{id};
+    </select>
+    <select id="getByUserList" resultType="java.util.Map">
+        SELECT
+            epj.id AS id,
+            epj.engin_name AS enginName,
+            epj.create_time AS createTime
+        FROM z_engineering_info  ei
+                 LEFT JOIN z_engineering_node en ON ei.eng_info_id = en.id
+                 LEFT JOIN ${type} epj ON epj.id = en.civli_id
+                <if test="szAndGy != null and szAndGy != ''">
+                    <if test="szAndGy == 'sz'">
+                        and epj.type = '1'
+                    </if>
+                    <if test="szAndGy == 'gy'">
+                        and epj.type = '2'
+                    </if>
+                </if>
+        WHERE ei.create_by = #{by} AND epj.id IS NOT NULL GROUP BY epj.id
+        <foreach collection="names" item="name">
+            union
+            SELECT
+            epj.id AS id,
+            epj.engin_name AS enginName,
+            epj.create_time AS createTime
+            FROM z_engineering_info_${name}  ei
+            LEFT JOIN z_engineering_node_${name} en ON ei.eng_info_id = en.id
+            LEFT JOIN ${type} epj ON epj.id = en.civli_id
+            <if test="szAndGy != null and szAndGy != ''">
+                <if test="szAndGy == 'sz'">
+                    and epj.type = '1'
+                </if>
+                <if test="szAndGy == 'gy'">
+                    and epj.type = '2'
+                </if>
+            </if>
+            WHERE ei.create_by = #{by} AND epj.id IS NOT NULL GROUP BY epj.id
+
+        </foreach>
+    </select>
 
 </mapper>