From 201ea73fb531ee30fd57465e210bd523eb10c95d Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 21 十月 2022 15:27:21 +0800
Subject: [PATCH] 查询案件代码重构 日志名称乱码
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 920a6f9..627cebf 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -9,10 +9,12 @@
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import com.ycl.entity.user.UmsAdminRoleRelation;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
+import com.ycl.mapper.user.UmsAdminRoleRelationMapper;
import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.vo.MyBacklogVO;
import org.springframework.beans.BeanUtils;
@@ -20,6 +22,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,34 +45,12 @@
@Resource
WorkflowConfigStepMapper workflowConfigStepMapper;
+ @Resource
+ UmsAdminRoleRelationMapper umsAdminRoleRelationMapper;
+
@Override
public List<MyBacklogVO> listMyTask(String num, Long userId) {
- return disposeRecordMapper.selectList(
- new LambdaQueryWrapper<DisposeRecord>()
- .eq(DisposeRecord::getHandlerId, userId.intValue())
- .isNull(DisposeRecord::getEndTime))
- .stream()
- .filter(item -> {
- if (StringUtils.isBlank(num)){
- return true;
- }else {
- BaseCase baseCase = baseCaseMapper.selectById(item.getBaseCaseId());
- if (baseCase.getCode().contains(num)) {
- return true;
- } else {
- return false;
- }
- }
- })
- .map(item -> {
- MyBacklogVO myBacklogVO = new MyBacklogVO();
- BeanUtils.copyProperties(item, myBacklogVO);
- BaseCase baseCase = baseCaseMapper.selectById(item.getBaseCaseId());
- myBacklogVO.setCategory(baseCase.getCategory());
- myBacklogVO.setEventSource(baseCase.getEventSource());
- myBacklogVO.setCode(baseCase.getCode());
- return myBacklogVO;
- }).collect(Collectors.toList());
+ return disposeRecordMapper.selectMyBackList(userId,num);
}
@Override
@@ -82,7 +63,7 @@
WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id",dispatchStep.getId());
+ updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
DisposeRecord updateRecord = new DisposeRecord();
updateRecord.setState(1);
--
Gitblit v1.8.0