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

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

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -80,7 +81,9 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @JsonProperty("zEngineeringNodeBoList")
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+    @JsonProperty("pics")
     private List<ZEngiineeringPhotoVo> pics;
 
 }

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

@@ -197,6 +197,8 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                         pic.setParentId(bo.getId());
                         pic.setPicUrl(o.getUrl());
                         pic.setFileName(o.getName());
+                        pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                        pic.setCreateTime(new Date());
                         pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
                         pic.setUpdateTime(new Date());
                         list.add(pic);