提交一把

jiangping

2024-06-20 577cbc6141c3194d4f3b6e71322ee8983d71a1f9

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

@@ -334,7 +334,7 @@
                    .eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
                    .and(StringUtils.isNotBlank(memberQueryDTO.getName()),i->i.like(Member::getName,memberQueryDTO.getName())
                            .or().like(Member::getIdcardNo,memberQueryDTO.getName()))
                    .le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
//                    .le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
                    .ge(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getEndTime,memberQueryDTO.getValidTime())
                    .in(CollectionUtils.isNotEmpty(memberQueryDTO.getSubtractMemberIds()),Member::getId,memberQueryDTO.getSubtractMemberIds())
                    .exists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&!Objects.isNull(memberQueryDTO.getValidTime()),
@@ -399,10 +399,6 @@
        if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "保单已过保，不支持该操作");
        }
        if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "保单已过保，不支持该操作");
        }

        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
@@ -429,7 +425,7 @@
                            .eq(ApplyDetail::getApplyId,insuranceApply.getId())
                            .eq(ApplyDetail::getApplyId,insuranceApply.getId())
                            .eq(ApplyDetail::getIdcardNo,model.getIdCard())
                            .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))
                         /*   .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
            if(detail == null){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" + model.getName()+model.getIdCard() + "】非在保人员，无法进行该操作");