From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 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 89982cb..cd562b1 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
@@ -81,8 +81,12 @@
private Long gxDeviceId;
@TableField(exist = false)
private String deviceName;
+
@TableField(exist = false)
private String deviceType;
+
+ @TableField(exist = false)
+ private String typeName;
/**
* 上报人
@@ -99,6 +103,25 @@
*/
private String videoUrls;
+ /**
+ * 文件附件
+ */
+ private String fileUrls;
+
+ /**
+ * 图片附件
+ */
+ private String imageName;
+
+ /**
+ * 视频附件
+ */
+ private String videoName;
+
+ /**
+ * 文件附件
+ */
+ private String fileName;
/**
* 审核意见
*/
@@ -114,4 +137,34 @@
*/
@TableField(exist = false)
private List<SgGxDO> sgGxDOS;
+
+ /**
+ *是否重新提交 0是 ，1否
+ */
+ private Integer resubmit;
+
+ /**
+ * 重新上报单据ID
+ */
+ @TableField(exist = false)
+ private String resubmitId;
+
+
+
+ @TableField(exist = false)
+ private List<String> userIDs;
+
+
+
+ @TableField(exist = false)
+ private String controlUnit;
+
+ @TableField(exist = false)
+ private String selfUnit;
+
+ @TableField(exist = false)
+ private String countyCd;
+
+ @TableField(exist = false)
+ private List<String> xbUnitIDs;
}
--
Gitblit v1.9.3