From 875f3931c547f18de9daf7e0db62d5f330b6caca Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Tue, 04 Nov 2025 13:53:59 +0800
Subject: [PATCH] 版本改造
---
expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
index e17abc1..c9de6c5 100644
--- a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
+++ b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
@@ -446,6 +446,9 @@
if (req.getState() == 1) {
projectFileMapper.deleteProjectFileByIdAndType(req.getId(), "1");
projectExpertMapper.deleteProjectExpertByProjectId(req.getId());
+ outProjectExpertMapper.update(new OutProjectExpert(),new LambdaUpdateWrapper<OutProjectExpert>()
+ .eq(OutProjectExpert::getProjectId, req.getId()).set(OutProjectExpert::getDelFlag, 1).set(OutProjectExpert::getUpdateTime, new Date())
+ .set(OutProjectExpert::getUpdateBy, SecurityUtils.getUsername()));
}
if (i > 0 && StringUtils.isNotEmpty(projectFile) && req.getState() == 3) {
//删除之前的该类型
@@ -784,8 +787,19 @@
if (projectManagement.getEvaluationState() == 0) {
throw new ServiceException("有专家未完成评定与报销，请完善后再试");
}
+ List<ProjectExpertExportInfoRes> projectExpertExportInfoRes = projectExpertMapper.projectExpertExportList(projectId);
+ projectExpertExportInfoRes.forEach(projectExpertExportInfoRes1 -> {
+ List<ProjectExpertExportResp> projectExpertExportResps = projectExpertExportInfoRes1.getProjectExpertExportResps();
+ Date maxUpdateTime = projectExpertExportResps.stream()
+ .map(ProjectExpertExportResp::getUpdateTime)
+ .max(Comparator.naturalOrder())
+ .orElse(null);
+ if (maxUpdateTime != null){
+ projectExpertExportInfoRes1.setUpdateTime(maxUpdateTime);
+ }
+ });
- return projectExpertMapper.projectExpertExportList(projectId);
+ return projectExpertExportInfoRes;
}
--
Gitblit v1.9.2