From 01410747fc92a6f7bccdf9497fcde43368dc9752 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 30 十一月 2024 08:05:27 +0800 Subject: [PATCH] 项目跟进回显部门 --- business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 6 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 d6086a7..381c0b0 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.ycl.common.utils.SecurityUtils; import com.ycl.domain.entity.ProjectPlanExamineRecord; +import com.ycl.domain.entity.ProjectPlanRecord; import com.ycl.domain.vo.DepartmentApprovalResponseVO; +import com.ycl.domain.vo.ProjectProcessToDoVo; 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; @@ -33,9 +36,11 @@ public class ProjectPlanExamineRecordServiceImpl extends ServiceImpl<ProjectPlanExamineRecordMapper, ProjectPlanExamineRecord> implements ProjectPlanExamineRecordService { private final ProjectPlanExamineRecordMapper projectPlanExamineRecordMapper; + private final ProjectPlanRecordMapper projectPlanRecordMapper; /** * 娣诲姞 + * * @param form * @return */ @@ -48,6 +53,7 @@ /** * 淇敼 + * * @param form * @return */ @@ -64,6 +70,7 @@ /** * 鎵归噺鍒犻櫎 + * * @param ids * @return */ @@ -75,6 +82,7 @@ /** * id鍒犻櫎 + * * @param id * @return */ @@ -86,6 +94,7 @@ /** * 鍒嗛〉鏌ヨ + * * @param query * @return */ @@ -98,6 +107,7 @@ /** * 鏍规嵁id鏌ユ壘 + * * @param id * @return */ @@ -110,6 +120,7 @@ /** * 鍒楄〃 + * * @return */ @Override @@ -123,18 +134,19 @@ @Override public Result departmentApproval(Integer projectPlanRecordId) { - List<DepartmentApprovalResponseVO> vo =baseMapper.selectInfo(projectPlanRecordId); + List<DepartmentApprovalResponseVO> vo = baseMapper.selectInfo(projectPlanRecordId); return Result.ok().data(vo); } @Override public Result planLog(Integer projectPlanRecordId) { - List<DepartmentApprovalResponseVO> vo =baseMapper.getPlanLog(projectPlanRecordId); + List<DepartmentApprovalResponseVO> vo = baseMapper.getPlanLog(projectPlanRecordId); return Result.ok().data(vo); } /** * 鍥炲瀹℃壒浜嬮」 + * * @param form * @return */ @@ -150,10 +162,30 @@ @Override public Result saveExamine(ProjectPlanExamineRecordForm form) { - ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null); - projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId()); - projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId()); - baseMapper.updateById(projectPlanExamineRecord); + // 鍒ゆ柇锛屽鏋滈兘鍚屾剰锛屽垯鐩存帴鏇存柊瀹℃壒璁板綍 + 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("鍥炲鎴愬姛"); } + + @Override + public Result todoList(Long userId, ProjectPlanExamineRecordQuery query) { + + IPage<ProjectProcessToDoVo> page = PageUtil.getPage(query, ProjectProcessToDoVo.class); + + baseMapper.todoList(page, query, userId); + return Result.ok().data(page.getRecords()).total(page.getTotal()); + } } -- Gitblit v1.8.0