Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-10-27 165f11c315a0283c6cf32572dddee5c81351cad8

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -20,7 +20,10 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.query.app.AppAllocationFileCond;
import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.pojo.vo.app.AppAllocationFindVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.*;
import com.moral.constant.Constants;
@@ -120,7 +123,7 @@
        //单号
        String allocationNum = "JBD-" + dateString + String.format("%04d", i);
        allocation.setAllocationNum(allocationNum);
        if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
        if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
        }
        if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -156,7 +159,7 @@
        }
        //获取用户信息
        Allocation allocation = allocationUpdateCond.convert();
        if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
        if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&& escalationType(allocationUpdateCond.getEscalationUnitId())) {
            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
        }
        if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
@@ -620,63 +623,138 @@
        //获取用户信息
        List<Integer> list = unitResult();
        if (!ObjectUtils.isEmpty(list)){
            Integer integer = list.get(0);
            if (integer==0){
                return null;
            }else {
                wrapper.in(Allocation::getUnitId,list);
            }
            wrapper.in(Allocation::getUnitId,list);
        }
        Integer integer = unitAreaCode();
        //普通权限或 管理员
        if (integer==0 || integer==1){
        // 管理员
        if (integer==1){
            if (state==3){
                wrapper.in(Allocation::getState,40,50);
            }else if (state==2){
                wrapper.eq(Allocation::getState,30);
                wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
            }else if (state==1){
                wrapper.eq(Allocation::getState,20);
                wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value,AllocationApproveEnum.IN_APPROVAL.value);
            }else {
                wrapper.eq(Allocation::getState,0);
            }
        //区域权限
        }else if (integer==2){
        }else if(integer == 0) {
            if (state==3){
                wrapper.in(Allocation::getState,40,50);
                wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
            }else if (state==2){
                wrapper.eq(Allocation::getState,20);
                wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
            }else if (state==1){
                wrapper.eq(Allocation::getState,30);
                wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value);
            }
        }else if(integer == 2){
            if (state==3){
                wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
            }else if (state==2){
                wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value);
            }else if (state==1){
                wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
            }
        }
        if (!ObjectUtils.isEmpty(startTime) && !ObjectUtils.isEmpty(endTime)){
            wrapper.between(Allocation::getEscalationTime,startTime,endTime);
        }
        wrapper.eq(Allocation::getIsDel,0).eq(Allocation::getIsInvalid,0);
        wrapper.orderByDesc(Allocation::getEscalationTime);
        wrapper.orderByDesc(Allocation::getEscalationTime,Allocation::getAllocationId);
        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){
            if ( integer==2){
                if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
                }else if (state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
                }else if (state1==30){
                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
                }else if (state1==40 ||state1==50){
                }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
                }
            }else {
                if (state1==20){
            }else if(integer==1){
                if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)||state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
                }else if (state1==30){
                }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
                }
            }else if(integer==0) {
                if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
                }else if (state1==40||state1==50){
                }else if (state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
                }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
                }
            }
            allocationFindVos.add(allocationFindVo);
        }
        return allocationFindVos;
    }

    @Override
    public Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond) {
        List<Integer> listUnit = unitResult();
        Integer integer = unitAreaCode();
        allocationPageCond.setUnitList(listUnit);
        allocationPageCond.setStateList(stateAllocationList(allocationPageCond.getState(),integer));
        Page<AllocationPageExt> extAppPage = this.baseMapper.extAppPage(allocationPageCond.getPage().convertPage(),allocationPageCond);
        extAppPage.getRecords().forEach(it->{
            Integer state = it.getState();
            if (state.equals(AllocationApproveEnum.DRAFT.value)||state.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
                if(integer==0||integer==1){
                    it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
                }else if(integer==2){
                    it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
                }
            }else if(state.equals(AllocationApproveEnum.IN_APPROVAL.value)){
                if(integer==2||integer==1){
                    it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
                }else if(integer==0){
                    it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
                }
            }else{
                it.setStateName(AppAllocationStateEnum.COMPLETED.name);
            }
        });

        return extAppPage;
    }

    @Override
    @Transactional
    public boolean saveFile(AppAllocationFileCond appAllocationFileCond) {
        fileTableService.upDateResult(Arrays.asList(appAllocationFileCond.getFile()),appAllocationFileCond.getUserId(), FileTableEnum.APP_ALLOCATION.value);
        return true;
    }

    private List<Integer> stateAllocationList(Integer type, Integer integer){
        List<Integer> integerList = new ArrayList<>();
        // type 0 全部 1待办 2待处理 3 已完成
        if(integer.equals(0)){
            if(type.equals(1)){
                integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
                integerList.add(AllocationApproveEnum.DRAFT.value);
            }else if(type.equals(2)){
                integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
            }
        }else if(integer.equals(2)){
            if(type.equals(1)){
                integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
            }else if(type.equals(2)){
                integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
                integerList.add(AllocationApproveEnum.DRAFT.value);
            }
        }else if(integer.equals(1)){
            if(type.equals(1)){
                integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
                integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
                integerList.add(AllocationApproveEnum.DRAFT.value);
            }
        }
        if(type.equals(3)){
            integerList.add(AllocationApproveEnum.PASS.value);
            integerList.add(AllocationApproveEnum.REFUSE.value);
        }
        return integerList;
    }

    /**
@@ -785,4 +863,12 @@
        }
        return 1;
    }
    private boolean escalationType(Integer id){
        boolean f = false;
        String code = responsibilityUnitMapper.selectAreaCode(id);
        if(code.length() == 6){
            return true;
        }
        return f;
    }
}