productDev/yunyibao.git

			@@ -1417,7 +1417,7 @@
			List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
			.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
			.eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
			.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
			// .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
			.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
			.orderByDesc(ApplyDetail::getCreateDate));
			if (applyDetailList.size() > Constants.ONE) {

			@@ -1062,7 +1062,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())
			@@ -1071,7 +1071,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())

	server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史