Merge remote-tracking branch 'origin/master'

jiangping

2024-01-23 a946438f6d69f976c94935f53dd7f326947aba0f

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

@@ -128,9 +128,11 @@
        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.SIGNATURE.getKey())){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
        }
        if(insuranceApply.getApplyEndTime()== null || insuranceApply.getStartTime().getTime()>insuranceApply.getApplyEndTime().getTime() ){
        if(model.getApplyEndTime()== null || insuranceApply.getStartTime().getTime()>insuranceApply.getApplyEndTime().getTime() ){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请生效周期时间不符合要求，请确认后修改重试~");
        }
        //计算实际截止时间
        Date actEndTime = new Date(insuranceApply.getApplyEndTime().getTime() + (insuranceApply.getStartTime().getTime() - model.getApplyStartTime().getTime()));
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        InsuranceApply update = new InsuranceApply();
        update.setEditDate(new Date());
@@ -141,12 +143,13 @@
        update.setCheckUserId(user.getId());
        update.setId(model.getId());
        update.setCode(insuranceApply.getCode());
        update.setEndTime(model.getApplyEndTime());
        update.setEndTime(actEndTime);
        update.setStartTime(insuranceApply.getStartTime());
        insuranceApplyMapper.updateById(update);

        insuranceApply.getBaoxiandanFile().setIsdeleted(Constants.ZERO);
        insuranceApply.getBaoxiandanFile().setCreator(user.getId());
        insuranceApply.getToubaodanFile().setObjId(update.getId());
        insuranceApply.getBaoxiandanFile().setCreateDate(update.getEditDate());
        insuranceApply.getBaoxiandanFile().setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
        insuranceApply.getBaoxiandanFile().setType(Constants.TWO);
@@ -162,6 +165,60 @@
        }
        ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);
        return  1;

    }
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public     Integer editBaoxiandan(InsuranceApply param) {
        if(param.getId() == null
                || param.getCode() == null
                || param.getBaoxiandanFile() == null
                || param.getCheckInfo() == null
                ||StringUtils.isBlank( param.getBaoxiandanFile().getFileurl())
                ||StringUtils.isBlank( param.getBaoxiandanFile() .getName())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }

        InsuranceApply model = insuranceApplyMapper.selectById(param.getId());
        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请当前不支持该操作~");
        }

        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        InsuranceApply update = new InsuranceApply();
        update.setEditDate(new Date());
        update.setEditor(user.getId());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo(param.getCheckInfo());
        update.setCheckUserId(user.getId());
        update.setId(model.getId());
        update.setCode(param.getCode());
        insuranceApplyMapper.updateById(update);
        //删除原有的保单信息
        multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
                .set(Multifile::getIsdeleted,Constants.ZERO)
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .eq(Multifile::getObjId,update.getId())
                .eq(Multifile::getObjType,Constants.MultiFile.BD_DONE_PDF.getKey())
        );
        param.getBaoxiandanFile().setIsdeleted(Constants.ZERO);
        param.getBaoxiandanFile().setObjId(update.getId());
        param.getBaoxiandanFile().setCreator(user.getId());
        param.getBaoxiandanFile().setCreateDate(update.getEditDate());
        param.getBaoxiandanFile().setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
        param.getBaoxiandanFile().setType(Constants.TWO);
        multifileMapper.insert(param.getBaoxiandanFile());

        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.PALTFORM_EDIT_BD;
        String info =  applyLogType.getInfo();
        info = info.replace("${param}",param.getCheckInfo());
        ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);

        return  1;

    }
@@ -208,8 +265,6 @@
        }
        update.setEditDate(new Date());
        update.setEditor(user.getId());
        //同意退回，直接回到最初状态，如果驳回退回申请，则保单状态回到待上传保险单
        update.setStatus(insuranceApply.getDealBackApply() ==0?Constants.InsuranceApplyStatus.UPLOAD.getKey():Constants.InsuranceApplyStatus.SIGNATURE.getKey());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo(insuranceApply.getCheckInfo());
        update.setCheckUserId(user.getId());
@@ -252,6 +307,7 @@

        insuranceApply.getToubaodanFile().setIsdeleted(Constants.ZERO);
        insuranceApply.getToubaodanFile().setCreator(user.getId());
        insuranceApply.getToubaodanFile().setObjId(update.getId());
        insuranceApply.getToubaodanFile().setCreateDate(update.getEditDate());
        insuranceApply.getToubaodanFile().setObjType(Constants.MultiFile.BD_APPLY_PDF.getKey());
        insuranceApply.getToubaodanFile().setType(Constants.TWO);