提交一把

jiangping

2024-06-20 ad5c2bf44c99d299cbb5b8182675aec514d55a57

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

@@ -841,8 +841,6 @@
        bigDecimalVO.setTotalFee(BigDecimal.ZERO);
        bigDecimalVO.setCurrentFee(BigDecimal.ZERO);
        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());


        List<ApplyChagneDetail> addList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ZERO)).collect(Collectors.toList());
        List<ApplyChagneDetail> reduceList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ONE)).collect(Collectors.toList());
        List<ApplyChagneDetail> changeList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.TWO)).collect(Collectors.toList());
@@ -957,13 +955,14 @@
                .set(Member::getStartTime,memberInsurance.getStartTime())
                .set(Member::getEndTime,memberInsurance.getEndTime())
                .set(Member::getDuId,memberInsurance.getDuId())
                .set(Member::getEditDate,applyChange.getEditDate())
                .set(Member::getEditor,applyChange.getEditor())
                .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
                .eq(Member::getId, memberInsurance.getMemberId())
        );

//        if(1==1){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//        }
//      if(1==1){
//          throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//      }
    }

    /**
@@ -1064,7 +1063,7 @@
        //实际批单生效日期
        Date applyStartTime = DateUtil.getMontageDate(applyChange.getApplyStartTime(),1);
        //查询减保人员是否存在 冲突的 保单明细数据
        if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
        /*if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
                .lambda()
                .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
                .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
@@ -1073,7 +1072,7 @@
        )<=Constants.ZERO){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，换厂人员【" + detail.getMemberName() + "】未查询到符合批单日期的数据");
        }

*/
        //查询员工是在主单下 是否存在生效中的数据
        ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
                .eq(ApplyDetail::getApplyId, applyChange.getApplyId())