From ec9a95eb994018cc1ba28a80946165f795001dea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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 ae2e7e6..1a1384a 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);
}
@@ -182,4 +181,32 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result examine(ProgressReportResponseVO form) {
+ // 鏇存柊瀹℃壒璁板綍
+ ProjectPlanExamineRecord record = new ProjectPlanExamineRecord();
+ record.setId(form.getExamineRecordId().longValue());
+ record.setDepartmentExamine(form.getDepartmentExamine());
+ record.setDepartmentApproval(form.getDepartmentApproval());
+ record.setManageExamine(form.getManageExamine());
+ record.setManageApproval(form.getManageApproval());
+ projectPlanExamineRecordMapper.updateById(record);
+
+ // 鏇存柊璁″垝椤圭姸鎬�
+ if (form.getDepartmentExamine() == 0 && form.getManageExamine() == 0){
+ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getId, form.getId())
+ .set(ProjectPlanInfo::getProgressStatus, 3)
+ .update();
+ }else {
+ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getId, form.getId())
+ .set(ProjectPlanInfo::getProgressStatus, 2)
+ .update();
+ }
+
+
+ return Result.ok("瀹℃壒鎴愬姛");
+ }
}
--
Gitblit v1.8.0