From 363cf83f55c886bacb8ccab451071442a3313e67 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 04:04:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
index 0404651..d6086a7 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.vo.DepartmentApprovalResponseVO;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
@@ -132,15 +133,27 @@
return Result.ok().data(vo);
}
+ /**
+ * 鍥炲瀹℃壒浜嬮」
+ * @param form
+ * @return
+ */
@Override
- public Result replyDepartmentApproval(ProjectPlanExamineRecordForm form) {
- baseMapper.updateByForm(form);
-// new LambdaUpdateChainWrapper<>(baseMapper)
-// .eq(ProjectPlanExamineRecord::getId, form.getId())
-// .set(ProjectPlanExamineRecord::getDepartmentApprovalReply,form.getDepartmentApprovalReply())
-// .set(ProjectPlanExamineRecord::getManageApprovalReply, form.getManageApprovalReply())
-// .set(ProjectPlanExamineRecord::getGmtUpdate ,new Date())
-// .update();
+ public Result replyExamine(ProjectPlanExamineRecordForm form) {
+ ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
+ projectPlanExamineRecord.setId(form.getId().longValue());
+ projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId());
+ projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId());
+ baseMapper.updateById(projectPlanExamineRecord);
+ return Result.ok("鍥炲鎴愬姛");
+ }
+
+ @Override
+ public Result saveExamine(ProjectPlanExamineRecordForm form) {
+ ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
+ projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId());
+ projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId());
+ baseMapper.updateById(projectPlanExamineRecord);
return Result.ok("鍥炲鎴愬姛");
}
}
--
Gitblit v1.8.0