From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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 | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 1777567..2dbd9e2 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
@@ -1,6 +1,7 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DisposeRecord;
@@ -33,16 +34,28 @@
DisposeRecordMapper disposeRecordMapper;
@Override
- public List<MyBacklogVO> listMyTask(Integer caseId, Long userId) {
+ 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(caseId);
+ BaseCase baseCase = baseCaseMapper.selectById(item.getBaseCaseId());
myBacklogVO.setCategory(baseCase.getCategory());
myBacklogVO.setEventSource(baseCase.getEventSource());
myBacklogVO.setCode(baseCase.getCode());
--
Gitblit v1.8.0