修改

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

@@ -286,4 +286,5 @@ private Date updateInfoTime;
     private String constructPhone;
     private String nickName;
     private String phonenumber;
+    private String state;
 }

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

@@ -102,4 +102,13 @@ public class ZEngineeringCivilExportVos extends BaseEntity implements Serializab
     private String phonenumber;
 
 
+    private String state;
+    private String statusA;
+    private String statusB;
+    private String statusC;
+    private String statusD;
+    private String statusE;
+    private String statusF;
+    private String statusG;
+
 }

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

@@ -405,16 +405,20 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
                     zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusA("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 } else if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
                     zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusA("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 }
                 if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
                     zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusA("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 } else if ("打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?")) {
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
                     zEngineeringCivilExportVos.setNickNameA(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusA("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 }
                 if ("立杠".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setLGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
@@ -422,16 +426,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setLGnumber(ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber())?"":zEngineeringCivilExportVo.getNumber().toString());
                     zEngineeringCivilExportVos.setNickNameB(zEngineeringCivilExportVo.getNickName().toString());
                     zEngineeringCivilExportVos.setPhonenumber(zEngineeringCivilExportVo.getPhonenumber().toString());
+                    zEngineeringCivilExportVos.setStatusB("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 }
                 if ("挂表".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBrand(zEngineeringCivilExportVo.getBrand());
                     zEngineeringCivilExportVos.setNickNameC(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusC("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 }
                 if ("表后管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBHGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setBHGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     zEngineeringCivilExportVos.setNickNameD(zEngineeringCivilExportVo.getNickName().toString());
                     zEngineeringCivilExportVos.setBHGnumber(ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber()) ? "" : zEngineeringCivilExportVo.getNumber().toString());
+                    zEngineeringCivilExportVos.setStatusD("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 }
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getBJQmaterialQuality())) {
                     zEngineeringCivilExportVos.setBJQmaterialQuality("");
@@ -439,25 +446,29 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if ("".equals(zEngineeringCivilExportVos.getBJQmaterialQuality()) && "报警器".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getBrand());
                     zEngineeringCivilExportVos.setNickNameE(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusE("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 } else if ("报警器".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVos.getBJQmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
 
                     zEngineeringCivilExportVos.setNickNameE(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setStatusE("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                 }if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality("");
                 }
                 if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality()) && "切断阀".equals(zEngineeringCivilExportVo.getType())){
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getBrand());
 
+                    zEngineeringCivilExportVos.setStatusF("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                     zEngineeringCivilExportVos.setNickNameF(zEngineeringCivilExportVo.getNickName().toString());}
                 else if ("切断阀".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
+                    zEngineeringCivilExportVos.setStatusF("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
 
                     zEngineeringCivilExportVos.setNickNameF(zEngineeringCivilExportVo.getNickName().toString());
                 }if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setVisitType(zEngineeringCivilExportVo.getVisitType());
                     zEngineeringCivilExportVos.setFGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
-
+                    zEngineeringCivilExportVos.setStatusG("1".equals(zEngineeringCivilExportVo.getState())?"通过":"待审核/未通过");
                     zEngineeringCivilExportVos.setNickNameG(zEngineeringCivilExportVo.getNickName().toString());
                     zEngineeringCivilExportVos.setFGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     if (!ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber()))

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

@@ -656,6 +656,7 @@
         a.completion_status,
         b.type,
         c.construct_addre,
+        c.state AS state,
         c.construct_according_drawings,
         c.segmented_compression_qualified,
         c.backfill_time,
@@ -754,6 +755,7 @@
             a.completion_status,
             b.type,
             c.construct_addre,
+            c.state AS state,
             c.construct_according_drawings,
             c.segmented_compression_qualified,
             c.backfill_time,
@@ -845,6 +847,7 @@
         END as engin_type,
         concat(c.dict_label,'——',a.remark) as completion_status,
         null AS type,
+        null AS state,
         null AS construct_addre,
         null AS construct_according_drawings,
         null AS segmented_compression_qualified,