fix：小程序添加流程状态变更

cjl

2023-11-08 0e4aa8d08a3bf8e8683d05081baefdbf96ce080f

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

@@ -12,6 +12,7 @@
import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bean.BaseInvalidEntity;
import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
import com.moral.api.pojo.enums.*;
@@ -69,6 +70,8 @@
    private ResponsibilityUnitService responsibilityUnitService;
    @Autowired
    private SysDictTypeService sysDictTypeService;
    @Autowired
    private UserService userService;

    /**
     * 根据字典类型获取字典数据
@@ -123,7 +126,7 @@
        //单号
        String allocationNum = "JBD-" + dateString + String.format("%04d", i);
        allocation.setAllocationNum(allocationNum);
        if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
        if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
        }
        if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -131,8 +134,10 @@
        }
        //获取新建图片
        allocationMapper.insert(allocation);
        //推送数据
        userService.pushOneUser(allocation);
        redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
        if(NEW_BUILT.equals(allocationCond.getState())) {
        if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationCond.getState())) {
            //添加流程数据
            ApproveTable approveTable = new ApproveTable();
            approveTable.setRelationId(allocation.getAllocationId());
@@ -525,6 +530,9 @@
        allocation.setState(changeCond.getState());
        allocation.setChangeTime(new Date());
        this.updateById(allocation);
        //推送数据
        Allocation allocation1 = this.getById(changeCond.getAllocationId());
        userService.pushOneUser(allocation1);
        //添加流程数据
        ApproveTable approveTable = new ApproveTable();
        approveTable.setRelationId(allocation.getAllocationId());
@@ -786,9 +794,12 @@
        //添加流程数据
        ApproveTable approveTable = new ApproveTable();
        approveTable.setRelationId(allocation.getAllocationId());
        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
       /* approveTable.setState(NEW_BUILT);
        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);
    }
@@ -834,6 +845,33 @@
    }

    @Override
    public boolean authority(String allocationNum,Integer userId) {
        //获取用户信息
        QxUser user = UserHelper.getCurrentUser();
        List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
        if(CollectionUtils.isNotEmpty(userList)){
            return true;
        }
        if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
            LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(Allocation::getAllocationNum,allocationNum);
            wrapper.eq(Allocation::getIsDel,0);
            wrapper.eq(Allocation::getIsInvalid,0);
            Allocation allocation = allocationMapper.selectOne(wrapper);
            if (allocation.getUnitId().equals(user.getUnitId())){
                return true;
            }
            String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
            if (code.length() > 6) {
                return false;
            } else {
                return true;
            }
        }
        return false;
    }

    @Override
    public List<Integer>  unitResult() {
        QxUser user = UserHelper.getCurrentUser();
        Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
@@ -855,15 +893,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;