提交代码

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

@@ -268,9 +268,16 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 zEngineeringCivilExportVos.setEnginType(zEngineeringCivilExportVo.getEnginType());
                 zEngineeringCivilExportVos.setEnginClassification(zEngineeringCivilExportVo.getEnginClassification());
                 zEngineeringCivilExportVos.setCompletionStatus(zEngineeringCivilExportVo.getCompletionStatus());
-                if ("拆旧管".equals(zEngineeringCivilExportVo.getType()))
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getCorrosionLevel())) {
+                    zEngineeringCivilExportVos.setCorrosionLevel("");
+                }
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType())&& zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                    zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
+                else if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                    zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
-                if ("打孔".equals(zEngineeringCivilExportVo.getType()))
+                else if ("打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
                 if ("立杠".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setLGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
@@ -284,10 +291,20 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setBHGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     zEngineeringCivilExportVos.setBHGnumber(zEngineeringCivilExportVo.getNumber().toString());
                 }
-                if ("报警器".equals(zEngineeringCivilExportVo.getType()))
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getBHGmaterialQuality())) {
+                    zEngineeringCivilExportVos.setBHGmaterialQuality("");
+                }
+                if ("".equals(zEngineeringCivilExportVos.getBHGmaterialQuality()) && "报警器".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
-                if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
+                else if ("报警器".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVos.getBJQmaterialQuality() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
+                    zEngineeringCivilExportVos.setQDFmaterialQuality("");
+                }
+                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality())&&"切断阀".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                else if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
                 if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setVisitType(zEngineeringCivilExportVo.getVisitType());
                     zEngineeringCivilExportVos.setFGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
@@ -343,22 +360,22 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 zEngineeringCivilExportVos.setEnginType(zEngineeringCivilExportVo.getEnginType());
                 zEngineeringCivilExportVos.setEnginClassification(zEngineeringCivilExportVo.getEnginClassification());
                 zEngineeringCivilExportVos.setCompletionStatus(zEngineeringCivilExportVo.getCompletionStatus());
-//                remarkd
-                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJtwz())){
+                //                remarkd
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJtwz())) {
                     zEngineeringCivilExportVos.setJtwz("");
                 }
-                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getSgwz())){
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getSgwz())) {
                     zEngineeringCivilExportVos.setSgwz("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getJtwz())){
+                if ("".equals(zEngineeringCivilExportVos.getJtwz())) {
                     zEngineeringCivilExportVos.setJtwz(zEngineeringCivilExportVo.getRemarkd());
-                }else {
-                    zEngineeringCivilExportVos.setJtwz(zEngineeringCivilExportVos.getJtwz()+"/"+zEngineeringCivilExportVo.getRemarkd());
+                } else {
+                    zEngineeringCivilExportVos.setJtwz(zEngineeringCivilExportVos.getJtwz() + "/" + zEngineeringCivilExportVo.getRemarkd());
                 }
-                if ("".equals(zEngineeringCivilExportVos.getSgwz())){
+                if ("".equals(zEngineeringCivilExportVos.getSgwz())) {
                     zEngineeringCivilExportVos.setSgwz(zEngineeringCivilExportVo.getConstructAddre());
-                }else {
-                    zEngineeringCivilExportVos.setSgwz(zEngineeringCivilExportVos.getSgwz()+"/"+zEngineeringCivilExportVo.getConstructAddre());
+                } else {
+                    zEngineeringCivilExportVos.setSgwz(zEngineeringCivilExportVos.getSgwz() + "/" + zEngineeringCivilExportVo.getConstructAddre());
                 }
             }
             arrayList.add(zEngineeringCivilExportVos);
@@ -414,14 +431,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setCxsy("√");
                 if ("×".equals(zEngineeringCivilExportVos.getDm()) && "打磨".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setDm("√");
-                if ("全貌照片".equals(zEngineeringCivilExportVo.getType())){
-                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKmaterialQuality())){
+                if ("全貌照片".equals(zEngineeringCivilExportVo.getType())) {
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKmaterialQuality())) {
                         zEngineeringCivilExportVos.setJKmaterialQuality("");
                     }
-                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKspecifications())){
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKspecifications())) {
                         zEngineeringCivilExportVos.setJKspecifications("");
                     }
-                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKnumber())){
+                    if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getJKnumber())) {
                         zEngineeringCivilExportVos.setJKnumber("");
                     }
                     if ("".equals(zEngineeringCivilExportVos.getJKmaterialQuality()))

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

@@ -320,7 +320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.head_name,
         c.head_phone,
         d.visit_type,
-        l.name as corrosion_level,
+        d.corrosion_level AS corrosion_level,
         n.name as self_closing_valve_type,
         m.name as brand,
         e.`name` AS material_quality,
@@ -402,7 +402,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.head_name,
             c.head_phone,
             d.visit_type,
-            l.name as corrosion_level,
+            d.corrosion_level AS corrosion_level,
             n.name as self_closing_valve_type,
             m.name as brand,
             e.`name` AS material_quality,