jinpengyong
2023-10-19 c8324bcbb8adb726c7aad1394045cf61383955b8
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -640,7 +640,7 @@
    public List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime) {
        ArrayList<AllocationFindVo> allocationFindVos = new ArrayList<>();
        LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
        wrapper.orderByDesc(Allocation::getEscalationTime);
        //获取用户信息
        List<Integer> list = unitResult();
        if (!ObjectUtils.isEmpty(list)){
@@ -679,9 +679,12 @@
        for (Allocation allocation : allocations) {
            AllocationFindVo allocationFindVo = new AllocationFindVo();
            BeanUtils.copyProperties(allocation,allocationFindVo);
            if (integer==0 || integer==1){
            }
            allocationFindVos.add(allocationFindVo);
        }
//        List<AllocationFindVo> allocationFindVos = allocationMapper.selectSmallRoutine(state);
        List<AllocationFindVo> allocationFindVo = allocationMapper.selectSmallRoutine(state,startTime,endTime);
        return allocationFindVos;
    }
@@ -694,8 +697,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())) {