提交一把

jiangping

2024-05-07 541c8aa8d08e4bb758adad33167d1e84943cbfec

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

@@ -365,7 +365,7 @@
        }
        //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
        //获取开始日期次日
        if(saveUnionChangeDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单生效期错误");
        }
@@ -628,6 +628,10 @@
        if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(unionChange.getType(),Constants.ONE)&&
                unionChangeBXDDTO.getDelValidTime() == null ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
        unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
        if(!unionChange.getShopId().equals(user.getCompanyId())){
@@ -648,7 +652,7 @@
        }
        //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
        //获取开始日期次日
        if(unionChangeBXDDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        if(unionChangeBXDDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
                || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单生效期错误");
        }
@@ -685,6 +689,10 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单明细记录存在非本合并单数据");
            };
            for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
                if(StringUtils.isBlank(m.getName())
                        || StringUtils.isBlank(m.getFileurl()) ){
                    continue;
                }
                if(Objects.isNull(m.getObjId())
                        ||StringUtils.isBlank(m.getFileurl())
                        ||StringUtils.isBlank(m.getName())
@@ -750,6 +758,7 @@
                .set(UnionChange::getEditDate,new Date())
                .set(UnionChange::getEditor,user.getId())
                .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
                .set(UnionChange::getDelValidTime,unionChangeBXDDTO.getDelValidTime())
                .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
                .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
                .eq(UnionChange::getId,unionChangeBXDDTO.getId())
@@ -998,7 +1007,7 @@

            //修改 员工投保明细记录 历史数据
            memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
                    .set(MemberInsurance::getEndTime,applyStartTime)
                    .set(MemberInsurance::getEndTime,DateUtil.getMontageDate(applyStartTime,3))
                    .set(MemberInsurance::getFee,oldFee)
                    .eq(MemberInsurance::getRelationId,oldModel.getId())
            );
@@ -1028,7 +1037,7 @@
            add.setFromId(detail.getId());
            applyDetailJoinMapper.insert(add);

            MemberInsurance memberInsurance = new MemberInsurance(oldModel,applyChange.getId());
            MemberInsurance memberInsurance = new MemberInsurance(add,applyChange.getId());
            memberInsurance.setSolutionId(detail.getSolutionId());
            memberInsurance.setWorktypeName(detail.getWorkTypeName());
            memberInsurance.setDuName(detail.getDuName());