Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

nidapeng

2024-04-03 658ae28a31f1a8956893ff7b7b29d92c5fdb00f4

 server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java

@@ -1749,9 +1749,9 @@
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Company company = user.getCompany();
        if(debugModel){
        /*if(debugModel){
            company = companyMapper.selectById(model.getCompanyId());
        }
        }*/
        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，企业尚未具备在线签章条件，请联系平台管理员确认~");
        }
@@ -1999,9 +1999,6 @@

        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Company company = companyMapper.selectById(model.getCompanyId());
        if(debugModel){
            company = companyMapper.selectById(model.getCompanyId());
        }
        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，企业尚未具备在线签章条件，请联系平台管理员确认~");
        }
@@ -2072,7 +2069,7 @@
        if(solutions.getType().equals(Constants.ZERO)){
           throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"直保单据无法进行该操作");
        }else{
            if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.COMPANY_SIGN.getKey())){
            if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
            }
        }
@@ -2086,9 +2083,9 @@
        update.setId(model.getId());
        if(applyChange.getDealBackApply() ==1){
            //如果是不通过
            update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey());
            update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
        }else{
            update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS.getKey());
            update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
        }
        applyChangeJoinMapper.updateById(update);
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;