From 99c3d7ccf9d518d441fc1af09f792f703f8f01de Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 27 十一月 2024 02:38:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 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 9ad060e..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,7 +1,9 @@ package com.ycl.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.ycl.domain.entity.ProjectPlanExamineRecord; +import com.ycl.domain.vo.DepartmentApprovalResponseVO; import com.ycl.mapper.ProjectPlanExamineRecordMapper; import com.ycl.service.ProjectPlanExamineRecordService; import com.ycl.common.base.Result; @@ -15,6 +17,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.util.Assert; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -116,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