我的待办逻辑修改 修改细节

wl

2022-10-19 b43362f688e046cf04b47ba37540be4d4ba1ae73

我的待办逻辑修改 修改细节

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java

@@ -48,7 +48,7 @@
                        .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
                        .eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment())
                        .eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId())
                        .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                        .between(StringUtils.isNotBlank(logQueryParams.getStartTime()) && StringUtils.isNotBlank(logQueryParams.getEndTime()), UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                        .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                        .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
        List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream()
@@ -113,7 +113,7 @@
                        .page(umsAdminLoginLogPage, new LambdaQueryWrapper<UmsAdminLoginLog>()
                                .like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent())
                                .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
                                .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                                .between(StringUtils.isNotBlank(logQueryParams.getStartTime()) && StringUtils.isNotBlank(logQueryParams.getEndTime()), UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                                .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                                .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
                        .getRecords()

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -216,9 +216,9 @@

    private void setDisposeRecord(Long id) {
        String stepName = StepName.DISPATCH.getName();
        QueryWrapper<WorkflowConfigStep> stepqurey = new QueryWrapper<>();
        stepqurey.eq("name", stepName);
        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepqurey);
        QueryWrapper<WorkflowConfigStep> stepQuery = new QueryWrapper<>();
        stepQuery.eq("name", stepName);
        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQuery);

        Integer state = 0;
        DisposeRecord disposeRecord = new DisposeRecord();

 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);