From bc44044892b29973b6faab8cccc0bbf317e601de Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 09:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
index 408768c..dc6ed30 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -68,7 +68,6 @@
baseMapper.insertOne(projectPlanProgressReport);
}else {
projectPlanProgressReport.setId(form.getProgressReportId());
-// baseMapper.updateOne(projectPlanProgressReport);
baseMapper.updateById(projectPlanProgressReport);
}
@@ -81,6 +80,7 @@
if (form.getFileList() != null && form.getFileList().size() > 0) {
form.getFileList().stream()
.forEach(file -> {
+ file.setId(null);
file.setBusId(form.getId().longValue());
file.setType(FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT);
file.setGmtCreate(new Date());
--
Gitblit v1.8.0