From 1ea92f7b715e9fcc6bbf8e0b34395d05385b1aaf Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 29 十一月 2024 21:39:55 +0800 Subject: [PATCH] 流程跟进列表返回流程是否挂起 --- business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 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..c7eb055 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,26 @@ 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.common.utils.SecurityUtils; import com.ycl.domain.entity.ProjectPlanExamineRecord; -import com.ycl.framework.utils.PageUtil; +import com.ycl.domain.entity.ProjectPlanRecord; +import com.ycl.domain.vo.DepartmentApprovalResponseVO; import com.ycl.mapper.ProjectPlanExamineRecordMapper; +import com.ycl.mapper.ProjectPlanRecordMapper; 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; @@ -31,6 +35,7 @@ public class ProjectPlanExamineRecordServiceImpl extends ServiceImpl<ProjectPlanExamineRecordMapper, ProjectPlanExamineRecord> implements ProjectPlanExamineRecordService { private final ProjectPlanExamineRecordMapper projectPlanExamineRecordMapper; + private final ProjectPlanRecordMapper projectPlanRecordMapper; /** * 娣诲姞 @@ -118,4 +123,51 @@ .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); + } + + /** + * 鍥炲瀹℃壒浜嬮」 + * @param form + * @return + */ + @Override + 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) { + // 鍒ゆ柇锛屽鏋滈兘鍚屾剰锛屽垯鐩存帴鏇存柊瀹℃壒璁板綍 + if (null != form.getDepartmentExamine() && null != form.getManageExamine() && form.getDepartmentExamine() == 0 && form.getManageExamine() == 0){ + ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null); + projectPlanExamineRecord.setId(form.getId().longValue()); + projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId()); + projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId()); + baseMapper.updateById(projectPlanExamineRecord); + } + // 鍚﹀垯锛屽皢椤圭洰璁板綍璁剧疆涓烘湭涓婃姤锛屽苟灏嗚褰曢�昏緫鍒犻櫎 + new LambdaUpdateChainWrapper<>(projectPlanRecordMapper) + .eq(ProjectPlanRecord::getId, form.getProjectPlanRecordId()) + .set(ProjectPlanRecord::getReportStatus,1); + new LambdaUpdateChainWrapper<>(baseMapper) + .eq(ProjectPlanExamineRecord::getProjectPlanRecordId, form.getProjectPlanRecordId()) + .remove(); + return Result.ok("鍥炲鎴愬姛"); + } } -- Gitblit v1.8.0