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

REQ-2135: 审批待办查询可执行的详情

Browse Source
This commit is contained in:
yanglin 2024-03-27 18:19:28 +08:00
parent 713dbe195e
commit 87cd4772e0
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
View File

@ -8,6 +8,7 @@ import cn.axzo.msg.center.message.service.todo.TodoRangeQueryService;
import cn.axzo.msg.center.message.service.todo.TodoSimpleQueryService; import cn.axzo.msg.center.message.service.todo.TodoSimpleQueryService;
import cn.axzo.msg.center.message.service.todo.manage.TodoManager; import cn.axzo.msg.center.message.service.todo.manage.TodoManager;
import cn.axzo.msg.center.service.enums.TerminalTypeEnum; import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
import cn.axzo.msg.center.service.enums.TodoType;
import cn.axzo.msg.center.service.pending.client.PendingMessageClient; import cn.axzo.msg.center.service.pending.client.PendingMessageClient;
import cn.axzo.msg.center.service.pending.request.CompletePendingBySubCodeRequest; import cn.axzo.msg.center.service.pending.request.CompletePendingBySubCodeRequest;
import cn.axzo.msg.center.service.pending.request.CompletePendingMessageByIdRequest; import cn.axzo.msg.center.service.pending.request.CompletePendingMessageByIdRequest;
@ -101,9 +102,9 @@ public class PendingMessageNewController implements PendingMessageClient {
@Override @Override
public CommonResponse<PendingMessageResponse> getLatestTodoByBiz( public CommonResponse<PendingMessageResponse> getLatestTodoByBiz(
String templateCode, String bizCode, String subBizCode) { String templateCode, String bizCode, String subBizCode, String todoType) {
PendingMessageResponse response = todoSimpleQueryService PendingMessageResponse response = todoSimpleQueryService
.getLatestTodoByBiz(templateCode, bizCode, subBizCode); .getLatestTodoByBiz(templateCode, bizCode, subBizCode, TodoType.valueOf(todoType));
return CommonResponse.success(response); return CommonResponse.success(response);
} }

7
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
View File

@ -8,6 +8,7 @@ import cn.axzo.msg.center.domain.entity.PendingRecordAdapter;
import cn.axzo.msg.center.domain.entity.Todo; import cn.axzo.msg.center.domain.entity.Todo;
import cn.axzo.msg.center.domain.entity.TodoBusiness; import cn.axzo.msg.center.domain.entity.TodoBusiness;
import cn.axzo.msg.center.service.enums.TerminalTypeEnum; import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
import cn.axzo.msg.center.service.enums.TodoType;
import cn.axzo.msg.center.service.pending.request.PendingMessageByBizCodeRequest; import cn.axzo.msg.center.service.pending.request.PendingMessageByBizCodeRequest;
import cn.axzo.msg.center.service.pending.request.PendingMessageQueryRequest; import cn.axzo.msg.center.service.pending.request.PendingMessageQueryRequest;
import cn.axzo.msg.center.service.pending.response.PendingMessageResponse; import cn.axzo.msg.center.service.pending.response.PendingMessageResponse;
@ -21,7 +22,6 @@ import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -74,9 +74,10 @@ public class TodoSimpleQueryService {
.toResponse(terminalType); .toResponse(terminalType);
} }
public PendingMessageResponse getLatestTodoByBiz(String templateCode, String bizCode, String subBizCode) { public PendingMessageResponse getLatestTodoByBiz(
String templateCode, String bizCode, String subBizCode, TodoType todoType) {
Todo todo = todoDao Todo todo = todoDao
.getLatestByBiz(templateCode, bizCode, subBizCode) .getLatestByBiz(templateCode, bizCode, subBizCode, todoType)
.orElse(null); .orElse(null);
if (todo == null) if (todo == null)
return null; return null;

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java
View File

@ -123,7 +123,8 @@ public interface PendingMessageClient {
CommonResponse<PendingMessageResponse> getLatestTodoByBiz( CommonResponse<PendingMessageResponse> getLatestTodoByBiz(
@RequestParam(value = "templateCode", required = false) String templateCode, @RequestParam(value = "templateCode", required = false) String templateCode,
@RequestParam(value = "bizCode", required = false) String bizCode, @RequestParam(value = "bizCode", required = false) String bizCode,
@RequestParam(value = "subBizCode", required = false) String subBizCode); @RequestParam(value = "subBizCode", required = false) String subBizCode,
@RequestParam(value = "todoType") String todoTyp);
/** /**
* 发送代办 * 发送代办

6
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java
View File

@ -4,6 +4,7 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
import cn.axzo.msg.center.dal.mapper.TodoMapper; import cn.axzo.msg.center.dal.mapper.TodoMapper;
import cn.axzo.msg.center.domain.entity.Todo; import cn.axzo.msg.center.domain.entity.Todo;
import cn.axzo.msg.center.domain.entity.TodoBusiness; import cn.axzo.msg.center.domain.entity.TodoBusiness;
import cn.axzo.msg.center.service.enums.TodoType;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@ -49,12 +50,13 @@ public class TodoDao extends ServiceImpl<TodoMapper, Todo> {
.list(); .list();
} }
public Optional<Todo> getLatestByBiz(@Nullable String templateCode, public Optional<Todo> getLatestByBiz(
String bizCode, String subBizCode) { @Nullable String templateCode, String bizCode, String subBizCode, TodoType todoType) {
if (StringUtils.isBlank(bizCode) && StringUtils.isBlank(subBizCode)) if (StringUtils.isBlank(bizCode) && StringUtils.isBlank(subBizCode))
return Optional.empty(); return Optional.empty();
Todo todo = lambdaQuery() Todo todo = lambdaQuery()
.eq(Todo::getIsDelete, TableIsDeleteEnum.NORMAL.value) .eq(Todo::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.eq(todoType != null, Todo::getType, todoType)
.eq(StringUtils.isNotBlank(templateCode), Todo::getTemplateCode, templateCode) .eq(StringUtils.isNotBlank(templateCode), Todo::getTemplateCode, templateCode)
.eq(StringUtils.isNotBlank(bizCode), Todo::getBizCode, bizCode) .eq(StringUtils.isNotBlank(bizCode), Todo::getBizCode, bizCode)
.eq(StringUtils.isNotBlank(subBizCode), Todo::getSubBizCode, subBizCode) .eq(StringUtils.isNotBlank(subBizCode), Todo::getSubBizCode, subBizCode)