From c2be8b6fd026bd93c09891febedc1cc06e5bed7e Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 19 十月 2022 14:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 67 ++++++++++++++++++++-------------
1 files changed, 40 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..f7db044 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,44 @@
@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());
+ ArrayList<MyBacklogVO> myBacklogVOS = new ArrayList<>();
+ umsAdminRoleRelationMapper
+ .selectList(new LambdaQueryWrapper<UmsAdminRoleRelation>()
+ .eq(UmsAdminRoleRelation::getAdminId, userId))
+ .forEach(item1 ->
+ myBacklogVOS.addAll(disposeRecordMapper.selectList(
+ new LambdaQueryWrapper<DisposeRecord>()
+ .eq(DisposeRecord::getHandlerRoleId, item1.getRoleId())
+ .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 myBacklogVOS;
}
@Override
@@ -82,7 +95,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