From 74ac7e48013eeb73fe76ad5c31c4b7afad967d0d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 14:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java | 2 ++
business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java | 2 ++
business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java | 5 +++++
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 28 ++++++++++++++++++++++++++++
4 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java b/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
index 64db8ca..dc6aac4 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
@@ -40,6 +40,11 @@
return projectPlanProgressReportService.add(form);
}
+ @PostMapping("/examine")
+ public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) {
+ return projectPlanProgressReportService.examine(form);
+ }
+
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
@PreAuthorize("hasAuthority('projectPlanProgressReport:edit')")
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
index 9753e95..f82e768 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
@@ -36,10 +36,12 @@
private Integer progressStatus;
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 璁″垝寮�濮嬫椂闂� */
private Date startTime;
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 璁″垝瀹屾垚鏃堕棿 */
private Date endTime;
diff --git a/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java b/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java
index c9fbd88..1c22da4 100644
--- a/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java
+++ b/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java
@@ -64,4 +64,6 @@
* @return
*/
Result all();
+
+ Result examine(ProgressReportResponseVO form);
}
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 dc6ed30..1a1384a 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -181,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