From bdef23946e420ba538870d6314034fbd42f00a66 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 5f124ab..0404651 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -1,22 +1,23 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.common.base.Result;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
-import com.ycl.framework.utils.PageUtil;
+import com.ycl.domain.vo.DepartmentApprovalResponseVO;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.service.ProjectPlanExamineRecordService;
-
+import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.domain.form.ProjectPlanExamineRecordForm;
import com.ycl.domain.vo.ProjectPlanExamineRecordVO;
import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
-
+import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -118,4 +119,28 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result departmentApproval(Integer projectPlanRecordId) {
+ List<DepartmentApprovalResponseVO> vo =baseMapper.selectInfo(projectPlanRecordId);
+ return Result.ok().data(vo);
+ }
+
+ @Override
+ public Result planLog(Integer projectPlanRecordId) {
+ List<DepartmentApprovalResponseVO> vo =baseMapper.getPlanLog(projectPlanRecordId);
+ return Result.ok().data(vo);
+ }
+
+ @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();
+ return Result.ok("鍥炲鎴愬姛");
+ }
}
--
Gitblit v1.8.0