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

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

@@ -51,17 +51,10 @@ public class ZEnginSpecificationsController extends BaseController {
      * 材质规格下拉
      */
     @GetMapping("/getEnginSpecificationsList")
-    public R getEnginSpecifications(String materId) {
+    public R getEnginSpecifications(@RequestParam("materId") String materId) {
         return R.ok(iZEnginSpecificationsService.getEnginSpecifications(materId));
     }
     /**
-     * 全部材质规格
-     */
-    @GetMapping("/getEnginSpecificationsListAll")
-    public R getEnginSpecificationsListAll() {
-        return R.ok(iZEnginSpecificationsService.getEnginSpecificationsListAll());
-    }
-    /**
      * 导出工程材质规格列表
      */
     @SaCheckPermission("zdsz:enginSpecifications:export")

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.zdsz;
 import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
@@ -119,4 +120,14 @@ public class ZEngineeringDangerousController extends BaseController {
     public R<ZEngineeringDangerousVo> queryEngineeringDangerous(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZEngineeringDangerousService.queryEngineeringDangerous(id));
     }
+
+    /**
+     * 危险工程-下拉
+     *
+     */
+    @SaCheckPermission("system:engineeringDangerous:list")
+    @GetMapping("/nameAndIdList")
+    public R<List<Map<String, Object>>> selectEnginNameAndId(ZEngineeringDangerousBo bo) {
+        return R.ok(iZEngineeringDangerousService.selectEnginNameAndId(bo));
+    }
 }

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

@@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
@@ -44,6 +45,19 @@ public class ZEngineeringInfrastructureController extends BaseController {
     private final IZEngineeringInfrastructureService iZEngineeringInfrastructureService;
 
     /**
+     * 查询基建工程下拉
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
+    @GetMapping("/select")
+    public R<List<ZEngineeringInfrastructureSelectVo>> select(ZEngineeringInfrastructureBo bo) {
+        try{
+            return R.ok(iZEngineeringInfrastructureService.select(bo));
+        }catch (Exception e){
+            return R.fail();
+        }
+    }
+
+    /**
      * 查询基建工程列表
      */
     @SaCheckPermission("zdsz:engineeringInfrastructure:list")

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.zdsz;
 import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
@@ -53,6 +54,16 @@ public class ZEngineeringPipeJackingController extends BaseController {
     }
 
     /**
+     *
+     * @param bo
+     * @return
+     */
+    @GetMapping("/nameList")
+    public R<List<Map<String,Object>>> nameList(ZEngineeringPipeJackingBo bo) {
+        return R.ok(iZEngineeringPipeJackingService.nameList(bo));
+    }
+
+    /**
      * 导出顶管工程列表
      */
     @SaCheckPermission("zdsz:engineeringPipeJacking:export")

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

@@ -51,7 +51,7 @@ public class ZUnitController extends BaseController {
      * @return
      */
     @GetMapping("/getUnitList")
-    public R getUnitList(String areaId, String buildingId) {
+    public R getUnitList(@RequestParam("areaId") String areaId, @RequestParam("buildingId") String buildingId) {
         return R.ok(iZUnitService.getUnitList(areaId, buildingId));
     }
 

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

@@ -0,0 +1,36 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 基建工程视图对象 z_engineering_infrastructure
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringInfrastructureSelectVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+}

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

@@ -22,6 +22,4 @@ public interface ZEnginSpecificationsMapper extends BaseMapperPlus<ZEnginSpecifi
     ZEnginSpecificationsVo getById(String id);
 
     List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
-
-    List<ZEnginSpecificationsVo> getEnginSpecificationsListAll();
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.mapper;
 
 import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
@@ -20,4 +21,6 @@ public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeri
     List<Map<String,Object>> getInfrastructure(String enginId);
 
     List<Map<String, Object>> getSg(String enginId);
+
+    List<Map<String, Object>> nameList(ZEngineeringPipeJackingBo bo);
 }

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

@@ -49,6 +49,4 @@ public interface IZEnginSpecificationsService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
-
-    List<ZEnginSpecificationsVo> getEnginSpecificationsListAll();
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 危险工程Service接口
@@ -71,4 +72,9 @@ public interface IZEngineeringDangerousService {
      */
     Boolean updateByBo(ZEngineeringDangerousBo bo);
 
+    /**
+     * 查询工程名称和id
+     */
+   List<Map<String, Object>> selectEnginNameAndId(ZEngineeringDangerousBo bo);
+
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 
 import java.util.Collection;
@@ -28,6 +29,11 @@ public interface IZEngineeringInfrastructureService {
     ZEngineeringInfrastructureVo queryByIdType(String id, String type);
 
     /**
+     * 查询基建工程下拉
+     */
+    List<ZEngineeringInfrastructureSelectVo> select(ZEngineeringInfrastructureBo bo);
+
+    /**
      * 查询基建工程列表
      */
     TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery);

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 顶管工程Service接口
@@ -48,4 +49,6 @@ public interface IZEngineeringPipeJackingService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     ZEngineeringPipeJackingVo queryByIdType(String id, String type);
+
+    List<Map<String, Object>> nameList(ZEngineeringPipeJackingBo bo);
 }

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

@@ -114,9 +114,4 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
     public List<ZEnginSpecificationsVo> getEnginSpecifications(String materId) {
         return baseMapper.getEnginSpecifications(materId);
     }
-
-    @Override
-    public List<ZEnginSpecificationsVo> getEnginSpecificationsListAll() {
-        return baseMapper.getEnginSpecificationsListAll();
-    }
 }

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

@@ -323,4 +323,18 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         vo.setPics(photoService.queryList(bo));
         return vo;
     }
+    @Override
+    public List<Map<String, Object>> selectEnginNameAndId(ZEngineeringDangerousBo bo) {
+        LambdaQueryWrapper<ZEngineeringDangerous> lqw = buildQueryWrapper(bo);
+        List<ZEngineeringDangerousVo> zEngineeringDangerousVos = baseMapper.selectVoList(lqw);
+        List<Map<String, Object>> filteredList = zEngineeringDangerousVos.stream()
+            .map(vo -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", vo.getEnginName());
+                map.put("id", vo.getId());
+                return map;
+            })
+            .collect(Collectors.toList());
+        return filteredList;
+    }
 }

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
@@ -181,7 +182,15 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         bo.getzEngineeringNodeBo().setCivliId(bo.getId());
         bo.getzEngineeringNodeBo().setType(bo.getType());
-        izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(bo.getId());
+        zEngineeringNodeBo.setType(bo.getType());
+        zEngineeringNodeBo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
+        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+        if (query != null) {
+            bo.getzEngineeringNodeBo().setId(query.getId());
+        }
+        izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
         return flag;
     }
 

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

@@ -12,6 +12,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
@@ -109,6 +110,21 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     }
 
     /**
+     * 查询基建工程下拉
+     */
+    @Override
+    public List<ZEngineeringInfrastructureSelectVo> select(ZEngineeringInfrastructureBo bo) {
+        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
+        List<ZEngineeringInfrastructureVo> result = baseMapper.selectVoList(lqw);
+        List<ZEngineeringInfrastructureSelectVo> list = new ArrayList();
+        for (ZEngineeringInfrastructureVo vo: result) {
+            ZEngineeringInfrastructureSelectVo select = BeanUtil.toBean(vo, ZEngineeringInfrastructureSelectVo.class);
+            list.add(select);
+        }
+        return list;
+    }
+
+    /**
      * 查询基建工程列表
      */
     @Override

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

@@ -87,6 +87,11 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         return jackingVo;
     }
 
+    @Override
+    public List<Map<String, Object>> nameList(ZEngineeringPipeJackingBo bo) {
+        return baseMapper.nameList(bo);
+    }
+
     /**
      * 查询顶管工程列表
      */

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

@@ -51,8 +51,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ze.mater_id = #{materId}
         </if>
     </select>
-
-    <select id="getEnginSpecificationsListAll" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
-        select * from z_engin_specifications as ze where ze.del_flag = '0'
-    </select>
 </mapper>

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

@@ -75,5 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             m.del_flag = '0'  and m.id = #{enginId}
     </select>
-
+    <select id="nameList" resultType="java.util.Map">
+        select id,engin_name as name from z_engineering_pipe_jacking where del_flag = '0'
+        <if test="enginName != null  and enginName != ''">
+            and engin_name like concat('%',#{enginName},'%')
+        </if>
+    </select>
 </mapper>