From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
index 44f9b41..0f552dd 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sg.DO;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
@@ -9,6 +10,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -77,6 +79,14 @@
* 施工设备ID
*/
private Long gxDeviceId;
+ @TableField(exist = false)
+ private String deviceName;
+
+ @TableField(exist = false)
+ private String deviceType;
+
+ @TableField(exist = false)
+ private String typeName;
/**
* 上报人
@@ -93,6 +103,25 @@
*/
private String videoUrls;
+ /**
+ * 文件附件
+ */
+ private String fileUrls;
+
+ /**
+ * 图片附件
+ */
+ private String imageName;
+
+ /**
+ * 视频附件
+ */
+ private String videoName;
+
+ /**
+ * 文件附件
+ */
+ private String fileName;
/**
* 审核意见
*/
@@ -102,4 +131,21 @@
* 审核人
*/
private String auditPerson;
+
+ /**
+ * 关联设备
+ */
+ @TableField(exist = false)
+ private List<SgGxDO> sgGxDOS;
+
+ /**
+ *是否重新提交 0是 ，1否
+ */
+ private Integer resubmit;
+
+ /**
+ * 重新上报单据ID
+ */
+ @TableField(exist = false)
+ private String resubmitId;
}
--
Gitblit v1.9.3