From d5e3cdd20b05c8a1856eafb1e1d022ed9e04200b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Wed, 20 Sep 2023 16:05:41 +0800
Subject: [PATCH] 删除整改状态，允许自选验收时间
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
index 6b6d161..0839131 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
@@ -1,13 +1,12 @@
package com.ruoyi.project.tr.hiddenDangerCheckPoint.domain;
import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
-import com.ruoyi.project.system.company.domain.Company;
import kotlin.jvm.Transient;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -18,6 +17,7 @@
* 隐患排查检查点信息表 tr_hidden_danger_check_point
*
*/
+@Data
public class HiddenDangerCheckPoint extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -347,6 +347,7 @@
/** 验收创建时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "验收创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date acceptCreateTime;
@@ -487,6 +488,13 @@
@Transient
private Long mobileCode;
+ @Transient
+ private Integer tag;
+
+ @Transient
+ private List<PreventRiskDangerConfirmLog> confirmLogList;
+
+
public Long getMobileCode() {
return mobileCode;
}
--
Gitblit v1.9.2