productDev/yunyibao.git

			@@ -1895,7 +1895,7 @@
			.apply(" t1.BASE_ID in ( select du.id from dispatch_unit du where du.STATUS = 0 and du.ISDELETED = 0 ) ")
			);
			if(!CollectionUtils.isNotEmpty(duSolutionList)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"数据异常：保险方案下未查询到派遣单位");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，保险方案下未查询到派遣单位信息，请确保派遣单位和工作配置并审核通过！");
			}
			//查询所有派遣单位下的工种
			List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
			@@ -1907,7 +1907,7 @@
			.eq(checkNewData,Worktype::getDataType,Constants.TWO)
			.in(DuWorktype::getDuSolutionId,duSolutionIdList));
			if(!CollectionUtils.isNotEmpty(duWorktypeList)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"数据异常：保险方案下未查询到工种信息");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，保险方案下未查询到工种信息，请确保派遣单位和工作配置并审核通过！");
			}

			if(CollectionUtils.isNotEmpty(applyDetailList)){
			@@ -1934,7 +1934,7 @@
			member.setCompanyId(insuranceApply.getCompanyId());
			member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
			if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"投保员工信息身份证信息错误["+member.getName()+"]");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，投保员工【"+member.getName()+"】身份证信息【"+applyDetail.getIdcardNo()+"】错误");
			}
			member.setIdcardNo(applyDetail.getIdcardNo());
			member.setApplyId(insuranceApply.getId());
			@@ -1957,7 +1957,7 @@
			\|\|Objects.isNull(applyDetail.getDuId())
			\|\|Objects.isNull(applyDetail.getWorktypeId())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"投保员工信息数据缺失");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，投保员工信息数据缺失，请按照要求填写员工的有效信息！");
			}
			applyDetail.setCreateDate(new Date());
			applyDetail.setCreator(loginUserInfo.getId());
			@@ -2011,18 +2011,18 @@
			//获取计算总天数
			Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
			if(Constants.equalsInteger(maxDays,0)\|\|Objects.isNull(applyDetail.getFee())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"投保信息异常：总天数与总金额错误");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"投保信息异常：投保总天数与总金额错误");
			}
			applyDetail.setPrice(
			applyDetail.getFee().divide(new BigDecimal(maxDays),7,RoundingMode.HALF_UP)
			);
			//验证派遣单位信息是否存在
			if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"【"+applyDetail.getMemberName()+"】员工派遣单位未查询到！");
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"【"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"】员工派遣单位未查询到！");
			}
			if(duWorktypeList.stream().filter(d->d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
			.collect(Collectors.toList()).size()<=Constants.ZERO){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"【"+applyDetail.getMemberName()+"】员工工种信息未查询到！");
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"【"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"】员工工种信息未查询到！");
			}
			}
			applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
			@@ -2123,7 +2123,8 @@
			queryWrapper.selectAs(Solutions::getPrice,InsuranceApply::getPrice);
			queryWrapper.selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit);
			queryWrapper.select(" DATEDIFF( t.END_TIME ,now() ) AS loseEfficacyDays ");
			queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum");
			queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum");
			queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum");
			if(!Objects.isNull(pageWrap.getModel())&&!Objects.isNull(pageWrap.getModel().getType())){
			queryWrapper.select(" ifnull(( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney");
			queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status = 1 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
			@@ -2395,6 +2396,7 @@
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate")
			.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
			.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum")
			.select(" t3.name as shopName")
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			@@ -2518,6 +2520,7 @@
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getType,InsuranceApply::getSolutionType)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum")
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(InsuranceApply::getId,model.getId())
			@@ -2534,6 +2537,7 @@
			.selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
			.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
			.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
			.ge(ApplyDetail::getEndTime,DateUtil.getPlusTime2(new Date()))
			.eq(ApplyDetail::getApplyId,model.getId());
			//查询明细
			List<ApplyDetail> detailList =applyDetailJoinMapper.selectJoinList(ApplyDetail.class,wrapper1);