From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 121 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 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
new file mode 100644
index 0000000..a1877f8
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
@@ -0,0 +1,121 @@
+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;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 施工进度上报表
+ * </p>
+ *
+ * @author shenyijian
+ * @since 2024-06-15 10:22:08
+ */
+@Getter
+@Setter
+@TableName("SG_PROGRESS_REPORT")
+public class SgProgressReportDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 项目id
+ */
+ private Long proframId;
+
+ /**
+ * 项目名称
+ */
+ private String programName;
+
+ /**
+ * 工序步骤id
+ */
+ private Long gxStepId;
+
+ /**
+ * 工序步骤名称
+ */
+ private String gxStepName;
+
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+
+ /**
+ * 施工工序进度
+ */
+ private String gxProgress;
+
+ /**
+ * 施工情况
+ */
+ private String remark;
+
+ /**
+ * 施工工序状态(0待审核 1进行中，2已完成)
+ */
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 施工设备ID
+ */
+ private Long gxDeviceId;
+ @TableField(exist = false)
+ private String deviceName;
+
+ @TableField(exist = false)
+ private String deviceType;
+
+ @TableField(exist = false)
+ private String typeName;
+
+ /**
+ * 上报人
+ */
+ private Long reportUser;
+
+ /**
+ * 图片附件
+ */
+ private String imagesUrls;
+
+ /**
+ * 视频附件
+ */
+ private String videoUrls;
+
+ /**
+ * 审核意见
+ */
+ private String auditOpinion;
+
+ /**
+ * 审核人
+ */
+ private String auditPerson;
+
+ /**
+ * 关联设备
+ */
+ @TableField(exist = false)
+ private List<SgGxDO> sgGxDOS;
+}
--
Gitblit v1.9.3