顶管新增修改查询

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

@@ -30,6 +30,8 @@ public class ZEngineeringPipeJacking extends BaseEntity {
     /**
      * 工程id
      */
+    private String enginId;
+
     private String enginName;
     /**
      * 工程地址

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

@@ -34,6 +34,9 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
      * 工程id
      */
     @NotBlank(message = "工程id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginId;
+
+
     private String enginName;
     /**
      * type

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

@@ -34,6 +34,8 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
      * 工程id
      */
     @ExcelProperty(value = "工程id")
+    private String enginId;
+
     private String enginName;
 
     /**

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

@@ -14,6 +14,8 @@ import java.util.Map;
  * @date 2024-01-02
  */
 public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeringPipeJackingMapper, ZEngineeringPipeJacking, ZEngineeringPipeJackingVo> {
-    List<Map<String,Object>> getCivil(String enginName);
-
+    List<Map<String,Object>> getCivil(String enginId);
+    List<Map<String,Object>> getIndustry(String enginId);
+    List<Map<String,Object>> getDangerous(String enginId);
+    List<Map<String,Object>> getInfrastructure(String enginId);
 }

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

@@ -94,12 +94,32 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean insertByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
+        //民用
         if (bo.getType()==1){
-            List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginName());
+            List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
+        //工业市政
+        else if(bo.getType()==2){
+        }
+        // 危险
+        else if(bo.getType()==3){
+            List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
+            if (!civil.isEmpty()){
+                add.setEnginName((String) civil.get(0).get("name"));
+                add.setEnginAddre((String) civil.get(0).get("address"));
+            }
+        }
+        //基建
+        else if(bo.getType()==4){
+            List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
+            if (!civil.isEmpty()){
+                add.setEnginName((String) civil.get(0).get("name"));
+                add.setEnginAddre((String) civil.get(0).get("address"));
+            }
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -117,13 +137,34 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
+        //民用
         if (bo.getType()==1){
-            List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginName());
+            List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
+        //工业市政
+        else if(bo.getType()==2){
+        }
+        // 危险
+        else if(bo.getType()==3){
+            List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
+            if (!civil.isEmpty()){
+                update.setEnginName((String) civil.get(0).get("name"));
+                update.setEnginAddre((String) civil.get(0).get("address"));
+            }
+        }
+        //基建
+        else if(bo.getType()==4){
+            List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
+            if (!civil.isEmpty()){
+                update.setEnginName((String) civil.get(0).get("name"));
+                update.setEnginAddre((String) civil.get(0).get("address"));
+            }
+        }
         bo.getNodeBo().setCivliId(bo.getId());
+        bo.getNodeBo().setCreateTime(bo.getCreateTime());
         nodeService.update(bo.getNodeBo());
         return baseMapper.updateById(update) > 0;
     }

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

@@ -26,11 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             m.*,
             CONCAT(
-                COALESCE(area.name, ''),
-                COALESCE(build.name, ''),
-                COALESCE(unit.name, ''),
-                COALESCE(house.name, '')
-            ) AS name
+                COALESCE ( area.NAME, '无' ),
+                '-',
+                COALESCE ( build.NAME, '无' ),
+                '-',
+                COALESCE ( unit.NAME, '无' ),
+                '-',
+                COALESCE ( house.NAME, '无' )
+            ) AS NAME
         FROM
             z_engineering_civil as m
                 left join z_area as area on area.del_flag = '0' and area.id = m.area_id
@@ -38,7 +41,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left join z_unit as unit on unit.del_flag = '0' and unit.id = m.unit_id
                 left join z_house as house on house.del_flag = '0' and house.id = m.house_id
         WHERE
-            m.del_flag = '0'  where m.id = #{enginName}
+            m.del_flag = '0'  and m.id = #{enginId}
+    </select>
+    <select id="getIndustry" resultType="java.util.Map">
+        SELECT
+            m.id,m.engin_name as name
+        FROM
+            z_engineering_industry as m
+        WHERE
+            m.del_flag = '0'  and m.id = #{enginId}
+    </select>
+    <select id="getDangerous" resultType="java.util.Map">
+        SELECT
+            m.id,m.engin_name as name,engin_addre as address
+        FROM
+            z_engineering_dangerous as m
+        WHERE
+            m.del_flag = '0'  and m.id = #{enginId}
+    </select>
+    <select id="getInfrastructure" resultType="java.util.Map">
+        SELECT
+            m.id,m.engin_name as name,engin_addre as address
+        FROM
+            z_engineering_infrastructure as m
+        WHERE
+            m.del_flag = '0'  and m.id = #{enginId}
     </select>
 
 </mapper>