git ch

k94314517

2025-05-19 cdd6551b190b981b807a3b95e9635c559ccc769d

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

@@ -1200,6 +1200,14 @@
        List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
        //加保数据
        List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        
        if(CollectionUtils.isEmpty(delDetailList)
        && CollectionUtils.isEmpty(addDetailList)
                && CollectionUtils.isEmpty(changeDetailList)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未添加人员数据无法进行提交");
        }

        if (CollectionUtils.isNotEmpty(addDetailList)) {
            if(Objects.isNull(solutions.getCanAdd()) || solutions.getCanAdd().equals(Constants.ZERO)){
@@ -1238,7 +1246,6 @@
        }

        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        if (CollectionUtils.isNotEmpty(changeDetailList)) {
            if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行换厂操作");
@@ -1358,6 +1365,7 @@
            }
            //查询员工是在主单下 是否存在生效中的数据
            List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                            .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
//                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
@@ -1616,6 +1624,7 @@
            }
            //查询员工是在主单下 是否存在生效中的数据
            List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                    .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))