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

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

@@ -46,37 +46,37 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     /**
      * 工程地址
      */
-//    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginAddre;
 
     /**
      * 工程编码
      */
-//    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginCode;
 
     /**
      * 施工单位
      */
-//    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructUnit;
 
     /**
      * 工程规模
      */
-//    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginScale;
 
     /**
      * 施工质量
      */
-//    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructQuality;
 
     /**
      * 施工进度
      */
-//    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructSchedule;
 
     /**

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

@@ -18,4 +18,6 @@ public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeri
     List<Map<String,Object>> getIndustry(String enginId);
     List<Map<String,Object>> getDangerous(String enginId);
     List<Map<String,Object>> getInfrastructure(String enginId);
+
+    List<Map<String, Object>> getSg(String enginId,String type);
 }

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

@@ -89,9 +89,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
+        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.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
+        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());
         lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringIndustry::getDesignUnit, bo.getDesignUnit());

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

@@ -198,10 +198,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             photoList.add(zEngiineeringPhoto);
         });
         izEngiineeringPhotoService.updateBatch(photoList);
-
-            izEngineeringMaterialService.updateList(bo);
-
-
+        izEngineeringMaterialService.updateList(bo);
         return baseMapper.updateById(update) > 0;
     }
 

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

@@ -114,20 +114,28 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
         //民用
-        if ("0".equals(bo.getType())){
+        if ("民用工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
         //市政
-        else if("1".equals(bo.getType())){
+        else if("市政工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"2");
+            if (!civil.isEmpty()){
+                add.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         //工业
-        else if("2".equals(bo.getType())){
+        else if("工业工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"1");
+            if (!civil.isEmpty()){
+                add.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         // 危险
-        else if("4".equals(bo.getType())){
+        else if("危险作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -135,7 +143,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if("5".equals(bo.getType())){
+        else if("基建作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -181,20 +189,28 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         //民用
-        if ("0".equals(bo.getType())){
+        if ("民用工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
         //市政
-        else if("1".equals(bo.getType())){
+        else if("市政工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"2");
+            if (!civil.isEmpty()){
+                update.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         //工业
-        else if("2".equals(bo.getType())){
+        else if("工业工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"1");
+            if (!civil.isEmpty()){
+                update.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         // 危险
-        else if("4".equals(bo.getType())){
+        else if("危险作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));
@@ -202,7 +218,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if("5".equals(bo.getType())){
+        else if("基建作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));

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

@@ -67,5 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             m.del_flag = '0'  and m.id = #{enginId}
     </select>
+    <select id="getSg" 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} and m.type = #{type}
+    </select>
 
 </mapper>