From a6ca2de18f549edc1e04c41a54d654adfc04bcde Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 25 Feb 2022 17:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88=E6=97=B6?=
 =?UTF-8?q?=E5=8F=AA=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8E=E8=80=97=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index e6e70e2c73..6a591d9e8d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -453,10 +453,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION,
 				ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current);
 
-		projectEntity.setStatus(ProjectConstant.CLOSED);
-		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
-		projectEntity.setWorkMinutes(workMinutes);
-		baseDao.updateById(projectEntity);
+		ProjectEntity newProject = new ProjectEntity();
+		newProject.setId(fromDTO.getProjectId());
+		newProject.setStatus(ProjectConstant.CLOSED);
+		newProject.setClosedStatus(fromDTO.getClosedStatus());
+		newProject.setWorkMinutes(workMinutes);
+		baseDao.updateById(newProject);
 		//更新项目关联表
 		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
 		projectStaffEntity.setId(fromDTO.getProjectStaffId());
@@ -655,10 +657,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION,
 				ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current);
 
-		projectEntity.setStatus(ProjectConstant.CLOSED);
-		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
-		projectEntity.setWorkMinutes(workMinutes);
-		baseDao.updateById(projectEntity);
+		ProjectEntity newProject = new ProjectEntity();
+		newProject.setId(fromDTO.getProjectId());
+		newProject.setStatus(ProjectConstant.CLOSED);
+		newProject.setClosedStatus(fromDTO.getClosedStatus());
+		newProject.setWorkMinutes(workMinutes);
+		baseDao.updateById(newProject);
 		//更新项目关联表
 		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
 		projectStaffEntity.setId(fromDTO.getProjectStaffId());