审核bug修复

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -160,13 +161,13 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     /**
      * 是否按图纸施工
      */
-    @ExcelProperty(value = "是否按图纸施工")
+    //@ExcelProperty(value = "是否按图纸施工")
     private String constructAccordingDrawings;
 
     /**
      * 分段打压是否合格
      */
-    @ExcelProperty(value = "分段打压是否合格")
+   // @ExcelProperty(value = "分段打压是否合格")
     private String segmentedCompressionQualified;
 
     /**
@@ -191,18 +192,19 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
      * 施工时间
      */
     @ExcelProperty(value = "施工时间")
+//    @JsonFormat("yyyy-MM-dd HH:mm:ss")
     private Date constructTime;
 
     /**
      * 负责人名称
      */
-    @ExcelProperty(value = "负责人名称")
+//    @ExcelProperty(value = "负责人名称")
     private String headName;
 
     /**
      * 负责人电话
      */
-    @ExcelProperty(value = "负责人电话")
+//    @ExcelProperty(value = "负责人电话")
     private String headPhone;
 
 //
@@ -225,7 +227,7 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     /**
      * 自闭阀类型
      */
-    @ExcelProperty(value = "自闭阀类型")
+    //@ExcelProperty(value = "自闭阀类型")
     private String selfClosingValveType;
     /**
      * 腐蚀等级
@@ -265,12 +267,12 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
 //    private String remark;
 //@TableField(fill = FieldFill.INSERT_UPDATE)
 //@TableField(exist = false)
-@ExcelProperty(value = "施工时间")
+//@ExcelProperty(value = "施工时间")
 private Date updateInfoTime;
     /**
      * 创建者
      */
    // @TableField(fill = FieldFill.INSERT)
-    @ExcelProperty(value = "施工人")
+    //@ExcelProperty(value = "施工人")
     private String createBy;
 }

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

@@ -396,20 +396,21 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 zEngiineeringPhoto.setType(photoType.constructionRecords.name().toString());
                 photoList2.add(zEngiineeringPhoto);
             });
-            if (!ObjectUtils.isEmpty(bo.getOnTheDitch()))
-            {
-                bo.getOnTheDitch().forEach(item -> {
-                    ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
-                    zEngiineeringPhoto.setParentId(bo.getId());
-                    zEngiineeringPhoto.setPicUrl(item);
-                    zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-                    zEngiineeringPhoto.setUpdateTime(new Date());
-                    zEngiineeringPhoto.setType(photoType.onTheDitch.name().toString());
-                    photoList2.add(zEngiineeringPhoto);
-                });
-            }
 
         }
+        if (!ObjectUtils.isEmpty(bo.getOnTheDitch()))
+        {
+            bo.getOnTheDitch().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.onTheDitch.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+        }
+
         if (!ObjectUtils.isEmpty(bo.getInferiorSulcus()))
         {
             bo.getInferiorSulcus().forEach(item -> {