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

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

@@ -111,8 +111,8 @@ public class ZEngineeringIndustryController extends BaseController {
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:query")
     @GetMapping("/{id}/{type}")
-    public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id) {
-        return R.ok(iZEngineeringIndustryService.query(id));
+    public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id, @PathVariable String type) {
+        return R.ok(iZEngineeringIndustryService.query(id, type));
     }
 
     /**

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

@@ -83,6 +83,14 @@ public class ZEngineeringIndustry extends BaseEntity {
      * 工程分类
      */
     private String enginClassification;
+
+    /**
+     * 字典项
+     * municipal_engineering_node
+     * 市政工程节点类型(沟上施工|沟下施工)
+     */
+    private String municipalEngineeringNode;
+
     /**
      * 乐观锁
      */

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

@@ -90,6 +90,13 @@ public class ZEngineeringIndustryBo extends BaseEntity {
      */
     private String type;
 
+    /**
+     * 字典项
+     * municipal_engineering_node
+     * 市政工程节点类型(沟上施工|沟下施工)
+     */
+    private String municipalEngineeringNode;
+
     private ZEngineeringNodeBo zEngineeringNodeBo;
 
     /**

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

@@ -135,6 +135,16 @@ public class ZEngineeringInfoBo extends BaseEntity {
     @NotNull(message = "沟上部分不能为空", groups = { AddGroup.class, EditGroup.class })
     public List<String> onTheDitch;
 
+    // 市政施工-沟上施工 焊接
+    public List<String> welding;
+    // 市政施工-沟上施工 防腐
+    public List<String> aczoiling;
+    // 市政施工-沟下施工 管道下沟
+    public List<String> piping;
+    // 市政施工-沟下施工 警示带铺设
+    public List<String> warning;
+    // 市政施工-沟下施工 回填
+    public List<String> backfilling;
 
     public List<String> getBeforeBottom() {
         return beforeBottom;

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

@@ -60,6 +60,7 @@ public class ZAreaVo implements Serializable {
     @ExcelProperty(value = "行政区", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "district")
     private String district;
+    private String districtName;
 
     /**
      * 核算行政区

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

@@ -110,6 +110,13 @@ public class ZEngineeringIndustryVo extends BaseEntity {
     @ExcelProperty(value = "工程分类")
     private String enginClassification;
 
+    /**
+     * 字典项
+     * municipal_engineering_node
+     * 市政工程节点类型(沟上施工|沟下施工)
+     */
+    private String municipalEngineeringNode;
+
     @JsonProperty("zEngineeringNodeBo")
     private ZEngineeringNodeBo zEngineeringNodeBo;
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/enums/photoType.java

@@ -5,6 +5,8 @@ import com.ruoyi.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 @AllArgsConstructor
 public enum photoType {
@@ -56,7 +58,17 @@ public enum photoType {
     /**
      * 沟上部分
      */
-    onTheDitch
-    ;
+    onTheDitch,
+
+    // 市政施工-沟上施工 焊接
+    welding,
+    // 市政施工-沟上施工 防腐
+    aczoiling,
+    // 市政施工-沟下施工 管道下沟
+    piping,
+    // 市政施工-沟下施工 警示带铺设
+    warning,
+    // 市政施工-沟下施工 回填
+    backfilling
 
 }

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

@@ -49,7 +49,7 @@ public interface IZEngineeringIndustryService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    ZEngineeringIndustryVo query(String id);
+    ZEngineeringIndustryVo query(String id, String type);
 
     List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo);
 }

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

@@ -94,7 +94,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         lqw.orderByDesc(ZEngineeringIndustry::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
         lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
         lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
@@ -188,11 +188,12 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             }
         }
         bo.getzEngineeringNodeBo().setCivliId(bo.getId());
-        bo.getzEngineeringNodeBo().setType(bo.getType());
+//        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.getType());
+        zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType()); // zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType());
         zEngineeringNodeBo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
         ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
         if (!ObjectUtils.isEmpty(query)) {
@@ -200,6 +201,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         bo.getzEngineeringNodeBo().setCreateTime(zEngineeringNodeBo.getCreateTime());
         izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        System.out.println("izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());");
         return flag;
     }
 
@@ -305,11 +307,14 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     @Override
-    public ZEngineeringIndustryVo query(String id) {
+    public ZEngineeringIndustryVo query(String id, String type) {
         ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
+        System.out.println("type===" + type);
+        zEngineeringNodeBo.setType(type);
+//        zEngineeringNodeBo.setType("trench_construction");
         zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
         return zEngineeringIndustryVo;
     }
@@ -330,7 +335,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         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.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
         }
 
         return queryWrapper;

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

@@ -102,6 +102,25 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngineeringInfoBo1.setInferiorSulcus(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.inferiorSulcus.name()));
             zEngineeringInfoBo1.setConstructionRecords(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.constructionRecords.name()));
             zEngineeringInfoBo1.setOnTheDitch(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.onTheDitch.name()));
+            // 市政施工 start
+            /*
+                // 市政施工-沟上施工 焊接
+                welding,
+                // 市政施工-沟上施工 防腐
+                aczoiling,
+                // 市政施工-沟下施工 管道下沟
+                piping,
+                // 市政施工-沟下施工 警示带铺设
+                warning,
+                // 市政施工-沟下施工 回填
+                backfilling
+            */
+            zEngineeringInfoBo1.setWelding(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.welding.name()));
+            zEngineeringInfoBo1.setAczoiling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.aczoiling.name()));
+            zEngineeringInfoBo1.setPiping(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.piping.name()));
+            zEngineeringInfoBo1.setWarning(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.warning.name()));
+            zEngineeringInfoBo1.setBackfilling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.backfilling.name()));
+            // 市政施工 end
             // bo.setId(item.getId());
             ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
             zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
@@ -395,6 +414,77 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             });
 
         }
+        // 市政施工 start
+        /*
+            // 市政施工-沟上施工 焊接
+            welding,
+            // 市政施工-沟上施工 防腐
+            aczoiling,
+            // 市政施工-沟下施工 管道下沟
+            piping,
+            // 市政施工-沟下施工 警示带铺设
+            warning,
+            // 市政施工-沟下施工 回填
+            backfilling
+        */
+        if (!ObjectUtils.isEmpty(bo.getWelding())) {
+            bo.getWelding().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.welding.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+        if (!ObjectUtils.isEmpty(bo.getAczoiling())) {
+            bo.getAczoiling().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.aczoiling.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+        if (!ObjectUtils.isEmpty(bo.getPiping())) {
+            bo.getPiping().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.piping.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+        if (!ObjectUtils.isEmpty(bo.getWarning())) {
+            bo.getWarning().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.warning.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+        if (!ObjectUtils.isEmpty(bo.getBackfilling())) {
+            bo.getBackfilling().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.backfilling.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+        // 市政施工 end
+
+
         if (!photoList.isEmpty()) {
             izEngiineeringPhotoService.insertBatch(photoList);
         }

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

@@ -33,9 +33,13 @@
         select
         a.id,
         a.name,
-        a.administrative
+        a.administrative,
+        a.district,
+        b.dict_label as districtName
         from z_area a
+        left join sys_dict_data b on a.district = b.dict_value
         where a.del_flag = '0'
+        and b.dict_type = 'district'
         <if test="district != null and district != ''">
             and a.district = #{district}
         </if>