From 302a2627da30424bbd07463fe03e2ece4885ed08 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 23 Mar 2024 15:58:33 +0800
Subject: [PATCH] 增加创建时间,更新时间

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProjectSchedule.java          |    6 ++++--
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java |   12 ++++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java                  |    4 ++--
 3 files changed, 18 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..a77d2f2 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
@@ -103,12 +103,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\"")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProjectSchedule.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProjectSchedule.java
index a95a454..b39de5f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProjectSchedule.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProjectSchedule.java
@@ -11,6 +11,8 @@
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 /**
  * 项目填报进度
  */
@@ -49,12 +51,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\"")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
index ab2d329..6c92c61 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
@@ -13,6 +13,8 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +43,9 @@
 
 	@Override
 	public Boolean updateCustomize(TbProjectDTO tbProjectDTO) {
+
+		tbProjectDTO.setUpdateUser(AuthUtil.getUserId().toString());
+		tbProjectDTO.setUpdateTime(DateUtil.now());
 		//更新项目表
 		boolean update = updateById(tbProjectDTO);
 
@@ -50,6 +55,13 @@
 		if (tbProjectScheduleList != null && tbProjectScheduleList.size()>0){
 			tbProjectScheduleList.forEach(tbProjectSchedule -> {
 				tbProjectSchedule.setTbProjectId(tbProjectDTO.getGuid());
+				tbProjectDTO.setUpdateUser(AuthUtil.getUserId().toString());
+				tbProjectDTO.setUpdateTime(DateUtil.now());
+
+				if (StringUtil.isBlank(tbProjectDTO.getGuid())){
+					tbProjectDTO.setCreateUser(AuthUtil.getUserId().toString());
+					tbProjectDTO.setCreateTime(DateUtil.now());
+				}
 				tbProjectScheduleService.saveOrUpdate(tbProjectSchedule);
 			});
 		}

--
Gitblit v1.9.3