From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库:施工:项目查询过滤无效修复、根据角色查询用户

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
index adfb185..3c07bfa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
@@ -75,7 +75,7 @@
 	//合同签订时间
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@TableField("\"contract_date\"")
+	@TableField(value = "\"contract_date\"",fill = FieldFill.UPDATE)
 	private Date contractDate;
 
 	//合同附件
@@ -85,7 +85,13 @@
 	//计划验收时间
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@TableField("\"check_date\"")
+	@TableField(value = "\"plan_check_date\"",fill = FieldFill.UPDATE)
+	private Date planCheckDate;
+
+	//验收时间
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField(value = "\"check_date\"",fill = FieldFill.UPDATE)
 	private Date checkDate;
 
 	//是否验收
@@ -103,12 +109,12 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@TableField("\"create_time\"")
-	private String createTime;
+	private Date createTime;
 
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@TableField("\"update_time\"")
-	private String updateTime;
+	private Date updateTime;
 
 	//修改人
 	@TableField("\"update_user\"")

--
Gitblit v1.9.3