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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

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

@@ -787,9 +787,12 @@
        //添加流程数据
        ApproveTable approveTable = new ApproveTable();
        approveTable.setRelationId(allocation.getAllocationId());
        approveTable.setState(NEW_BUILT);
        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
        approveTable.setStateName("新建");
        approveTableService.saveResult(approveTable);
        approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
        approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
        approveTableService.saveResult(approveTable);
        fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
    }
@@ -842,7 +845,7 @@
        if(CollectionUtils.isNotEmpty(userList)){
            return true;
        }
        if(Objects.nonNull(user.getUnitId())){
        if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
            LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(Allocation::getAllocationNum,allocationNum);
            wrapper.eq(Allocation::getIsDel,0);
@@ -852,13 +855,13 @@
                return true;
            }
            String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
            if(code.length()>6){
            if (code.length() > 6) {
                return false;
            }else {
            } else {
                return true;
            }
        }
        return true;
        return false;
    }

    @Override
@@ -883,15 +886,15 @@
        if(CollectionUtils.isNotEmpty(userList)){
            return 1;
        }
        if(Objects.nonNull(user.getUnitId())){
        if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0) {
            String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
            if(code.length()>6){
            if (code.length() > 6) {
                return 0;
            }else {
            } else {
                return 2;
            }
        }
        return 1;
        return 0;
    }
    private boolean escalationType(Integer id){
        boolean f = false;