From 11e8a8f6e8cc27514447a49606842b890cdadba8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 14:43:56 +0800
Subject: [PATCH] 流程日志查询完善
---
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 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 c8a6e44..5b149f2 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -5,9 +5,7 @@
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.entity.ProjectPlanInfo;
-import com.ycl.domain.entity.ProjectPlanRecord;
-import com.ycl.domain.vo.DepartmentApprovalResponseVO;
-import com.ycl.domain.vo.ProgressReportResponseVO;
+import com.ycl.domain.form.ProgressReportResponseForm;
import com.ycl.domain.vo.ProjectProcessToDoVo;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.mapper.ProjectPlanInfoMapper;
@@ -22,9 +20,9 @@
import lombok.RequiredArgsConstructor;
import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -116,7 +114,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
ProjectPlanExamineRecordVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
@@ -137,15 +135,13 @@
}
@Override
- public Result departmentApproval(Integer projectPlanRecordId) {
- List<DepartmentApprovalResponseVO> vo = baseMapper.selectInfo(projectPlanRecordId);
- return Result.ok().data(vo);
+ public Result departmentApproval(Long projectPlanRecordId) {
+ return Result.ok().data(baseMapper.selectInfo(projectPlanRecordId));
}
@Override
- public Result planLog(Integer projectPlanRecordId) {
- List<DepartmentApprovalResponseVO> vo = baseMapper.getPlanLog(projectPlanRecordId);
- return Result.ok().data(vo);
+ public Result planLog(Long projectPlanRecordId) {
+ return Result.ok().data(baseMapper.getPlanLog(projectPlanRecordId));
}
/**
@@ -157,22 +153,22 @@
@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());
+ projectPlanExamineRecord.setId(form.getId());
baseMapper.updateById(projectPlanExamineRecord);
return Result.ok("鍥炲鎴愬姛");
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result saveExamine(ProjectPlanExamineRecordForm form) {
// 鏇存柊瀹℃壒璁板綍
- ProjectPlanExamineRecord item = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
- item.setId(form.getId().longValue());
- item.setDepartmentUserId(SecurityUtils.getUserId());
- item.setManagerUserId(SecurityUtils.getUserId());
- baseMapper.updateById(item);
- Long projectPlanRecordId = baseMapper.selectById(item.getId()).getProjectPlanRecordId();
+ ProjectPlanExamineRecord entity = new ProjectPlanExamineRecord();
+ BeanUtils.copyProperties(form, entity);
+ entity.setId(form.getId());
+ entity.setDepartmentUserId(SecurityUtils.getUserId());
+ entity.setManagerUserId(SecurityUtils.getUserId());
+ baseMapper.updateById(entity);
+ Long projectPlanRecordId = baseMapper.selectById(entity.getId()).getProjectPlanRecordId();
// 濡傛灉鍚屾剰锛岃鍒掗」鐘舵�佷负宸查�氳繃锛屽苟涓旀柊澧炰竴鏉￠」鐩繘搴﹀鏍歌褰曪紝鍚﹀垯涓哄凡椹冲洖
if (null != form.getDepartmentExamine() && null != form.getManageExamine() && form.getDepartmentExamine() == 0 && form.getManageExamine() == 0) {
new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
@@ -182,9 +178,8 @@
// 鏂板椤圭洰杩涘害瀹℃牳璁板綍
ProjectPlanExamineRecord newItem = new ProjectPlanExamineRecord();
newItem.setProjectPlanRecordId(projectPlanRecordId); // 椤圭洰璁″垝璁板綍ID
- newItem.setProjectPlanInfoId(item.getProjectPlanInfoId()); // 椤圭洰璁″垝椤笽D
+ newItem.setProjectPlanInfoId(entity.getProjectPlanInfoId()); // 椤圭洰璁″垝椤笽D
newItem.setEventType(2); // 杩涘害涓婃姤
- newItem.setDeleted(0); // 鏈垹闄�
baseMapper.insert(newItem);
}else{
new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
@@ -205,7 +200,7 @@
}
@Override
- public Result reply(ProgressReportResponseVO form) {
+ public Result reply(ProgressReportResponseForm form) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(ProjectPlanExamineRecord::getId, form.getExamineRecordId())
.set(ProjectPlanExamineRecord::getDepartmentApprovalReply, form.getDepartmentApprovalReply())
--
Gitblit v1.8.0