wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2595-调整业务待办转交逻辑

Browse Source
This commit is contained in:
yangqicheng 2024-10-25 14:06:24 +08:00
parent 9409f7c08e
commit 8be1bf1be4
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
View File

@ -196,7 +196,7 @@ public class TodoManager {
*/
@Transactional(rollbackFor = Exception.class)
public Integer handover(TodoHandoverRequest request) {
BizAssertions.assertNotBlank(request.getFromPersonName(), "交接来源人自然人姓名不能为空");
// BizAssertions.assertNotBlank(request.getFromPersonName(), "交接来源人自然人姓名不能为空");
BizAssertions.assertNotEmpty(request.getTodoIdentityCodes(), "需要转交的待办编码不能为空");
List<Todo> candidates = todoDao.getByCodes(request.getTodoIdentityCodes());
// 只处理未完成的
@ -234,6 +234,9 @@ public class TodoManager {
destTodo.setExecutorId(0L);
destTodo.setExecutorType(IdentityTypeEnum.NOT_SUPPORT);
destTodo.setOuId(request.getToOuId());
if (request.getToWorkspaceId() != null) {
destTodo.setOrgId(request.getToWorkspaceId());
}
destTodo.setExecutorPersonId(request.getToPersonId());
destTodo.setExecutorName(request.determineToPersonName());
}
@ -487,12 +490,12 @@ public class TodoManager {
@Transactional(rollbackFor = Exception.class)
public Boolean batchSetProcessing(List<String> identityCodes, List<String> subBizCodes) {
BizAssertions.assertTrue(
CollectionUtils.isNotEmpty(identityCodes) || CollectionUtils.isNotEmpty(subBizCodes) ,
CollectionUtils.isNotEmpty(identityCodes) || CollectionUtils.isNotEmpty(subBizCodes),
"identityCodes或subBizCodes列表不能为空");
List<Todo> todos;
if (CollectionUtils.isNotEmpty(identityCodes))
todos = todoDao.getByIdentityCodes(identityCodes);
else
else
todos = todoDao.getBySubBizCodes(subBizCodes, true);
Boolean updated = todoDao.batchSetExecutableProcessing(identityCodes, subBizCodes);
if (updated) {

17
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/TodoHandoverRequest.java
View File

@ -3,7 +3,6 @@ package cn.axzo.msg.center.service.pending.request;
import com.alibaba.fastjson.JSON;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@ -17,19 +16,19 @@ public class TodoHandoverRequest {
/**
* 交接来源自然人id
*/
@NotNull(message = "fromPersonId is required")
@Deprecated
private Long fromPersonId;
/**
* 交接来源人自然人姓名
*/
@NotBlank(message = "fromPersonName is required")
@Deprecated
private String fromPersonName;
/**
* 交接来源单位id
*/
@NotNull(message = "fromOuId is required")
@Deprecated
private Long fromOuId;
/**
@ -49,6 +48,16 @@ public class TodoHandoverRequest {
@NotNull(message = "toOuId is required")
private Long toOuId;
/**
* 交接工作台id
*/
private Long toWorkspaceId;
/**
* 操作人id
*/
private String operatePersonId;
/**
* 需要转交的待办编码
*/