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 | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 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 444a47f..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,10 +1,20 @@ 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; +import com.ycl.mapper.caseHandler.BaseCaseMapper; import com.ycl.mapper.caseHandler.DisposeRecordMapper; import com.ycl.service.caseHandler.IDisposeRecordService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.vo.MyBacklogVO; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -17,4 +27,39 @@ @Service public class DisposeRecordServiceImpl extends ServiceImpl<DisposeRecordMapper, DisposeRecord> implements IDisposeRecordService { + @Resource + BaseCaseMapper baseCaseMapper; + + @Resource + DisposeRecordMapper disposeRecordMapper; + + @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()); + } } -- Gitblit v1.8.0