blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-10-20 4dc15079f5e5fe8620a0c9d1787e838a960269b9 
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java


@@ -1,12 +1,19 @@


package com.moral.api.service.impl;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.config.Interceptor.UserHelper;


import com.moral.api.entity.*;


import com.moral.api.exception.BusinessException;


import com.moral.api.mapper.AllocationMapper;


import com.moral.api.mapper.ResponsibilityUnitMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.SysDictTypeMapper;


import com.moral.api.pojo.bean.BaseInvalidEntity;


import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;


import com.moral.api.pojo.enums.*;


import com.moral.api.pojo.ext.allocation.AllocationExt;


import com.moral.api.pojo.ext.allocation.AllocationListExt;


@@ -15,8 +22,10 @@


import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;


import com.moral.api.pojo.vo.allocation.AllocationFindVo;


import com.moral.api.pojo.vo.user.QxUser;


import com.moral.api.service.AllocationExtensionService;


import com.moral.api.service.ApproveTableService;


import com.moral.api.service.*;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.collections4.CollectionUtils;


import org.springframework.beans.BeanUtils;


@@ -26,43 +35,8 @@


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;




import java.util.ArrayList;


import java.util.Date;


import java.util.HashMap;


import java.util.Iterator;


import java.util.List;


import java.util.Map;


import java.util.Set;


import java.util.stream.Collectors;


import java.util.*;






import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.entity.Allocation;


import com.moral.api.entity.ApproveTable;


import com.moral.api.entity.ResponsibilityUnit;


import com.moral.api.entity.SysArea;


import com.moral.api.entity.SysDictData;


import com.moral.api.entity.SysDictType;


import com.moral.api.mapper.AllocationMapper;


import com.moral.api.mapper.ResponsibilityUnitMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.SysDictTypeMapper;


import com.moral.api.pojo.dto.allocation.AllocationUnitDto;


import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;


import com.moral.api.pojo.enums.AllocationApproveEnum;


import com.moral.api.pojo.vo.file.FileVo;


import com.moral.api.service.AllocationService;


import com.moral.api.service.FileTableService;


import com.moral.api.service.ResponsibilityUnitService;


import com.moral.api.service.SysAreaService;


import com.moral.api.service.SysDictDataService;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;


import com.moral.util.TokenUtils;


import com.sun.javafx.scene.control.skin.VirtualFlow;


import java.util.stream.Collectors;






@Service


@@ -640,7 +614,6 @@


    public List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime) {


        ArrayList<AllocationFindVo> allocationFindVos = new ArrayList<>();


        LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();




        //获取用户信息


        List<Integer> list = unitResult();


        if (!ObjectUtils.isEmpty(list)){


@@ -675,13 +648,31 @@


            wrapper.between(Allocation::getEscalationTime,startTime,endTime);


        }


        wrapper.eq(Allocation::getIsDel,0).eq(Allocation::getIsInvalid,0);


        wrapper.orderByDesc(Allocation::getEscalationTime);


        List<Allocation> allocations = allocationMapper.selectList(wrapper);


        for (Allocation allocation : allocations) {


            AllocationFindVo allocationFindVo = new AllocationFindVo();


            BeanUtils.copyProperties(allocation,allocationFindVo);


            Integer state1 = allocationFindVo.getState();


            if (integer==0 || integer==1){


                if (state1==20){


                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);


                }else if (state1==30){


                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);


                }else if (state1==40 ||state1==50){


                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);


                }


            }else {


                if (state1==20){


                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);


                }else if (state1==30){


                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);


                }else if (state1==40||state1==50){


                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);


                }


            }


            allocationFindVos.add(allocationFindVo);


        }


//        List<AllocationFindVo> allocationFindVos = allocationMapper.selectSmallRoutine(state);


        return allocationFindVos;


    }




@@ -694,8 +685,8 @@


    @Transactional


    public void changeSmallRoutine(AllocationChangeCond changeCond) {


        Integer integer = unitAreaCode();


        if (integer==1){


            throw new BusinessException("此账户只能审批，不能整改！");


        if (integer==2){


            throw new BusinessException("此账户只能审核，不能整改！");


        }


        AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());


        if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {