productDev/yunyibao.git

			@@ -32,6 +32,7 @@
			import com.github.xiaoymin.knife4j.core.util.CollectionUtils;

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -79,6 +80,8 @@

			@Autowired
			private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
			@Autowired
			private MemberMapper memberMapper;
			@Value("${debug_model}")
			private boolean debugModel;

			@@ -155,12 +158,19 @@
			.selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
			queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");

			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0 ) as addApplyNum ");
			if(pageWrap.getModel().getQueryFlag() == 1){
			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0 ) as addApplyNum ");
			}else if(pageWrap.getModel().getQueryFlag() ==2){
			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1 ) as changeApplyNum ");
			}else{
			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0 ) as addApplyNum ");

			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");

			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");
			}
			queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(Constants.equalsInteger(user.getType(),Constants.TWO)){
			@@ -734,9 +744,22 @@
			List<UnionApplyBXDDetailDTO> unionApplyBXDDetailDTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailDTOList();

			//所有投保申请保单明细行
			List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
			.select(ApplyDetail::getId,ApplyDetail::getApplyId,ApplyDetail::getPrice)
			List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
			.selectAll(ApplyDetail.class)
			.selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
			.selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
			.selectAs(Solutions::getId,ApplyDetail::getSolutionId)
			.selectAs(Solutions::getName,ApplyDetail::getSolutionName)
			.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
			.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo)
			.selectAs(Member::getName,ApplyDetail::getMemberName)
			.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
			.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
			.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.in(ApplyDetail::getUnionApplyId,unionApply.getId()));
			unionApplyBXDDTO.setEndTime(DateUtil.getMontageDate(unionApplyBXDDTO.getEndTime(),2));
			//总天数
			Integer maxDays = DateUtil.calculateBetween(unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),0);
			//实际已经产生费用的天数
			@@ -760,12 +783,15 @@
			}
			BigDecimal price = Constants.formatBigdecimal(applyDetails.get(Constants.ZERO).getPrice());


			Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
			m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
			BigDecimal serverCost = BigDecimal.ZERO;
			if(unionApplyBXDDDetailTO.isPresent()){
			UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
			price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(unionApplyBXDDetailDTO.getServerMoney()));
			serverCost = unionApplyBXDDetailDTO.getServerMoney();
			BigDecimal dayServerMoney = unionApplyBXDDetailDTO.getServerMoney().divide(new BigDecimal(maxDays),2, RoundingMode.HALF_UP);

			price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(dayServerMoney));
			//上传保单信息
			if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
			Multifile multifile = new Multifile();
			@@ -793,12 +819,26 @@
			//生成投保记录
			if(CollectionUtils.isNotEmpty(applyDetailList)){
			List<MemberInsurance> memberInsuranceList = new ArrayList<>();
			for (ApplyDetail applyDetail:applyDetailList) {
			for (ApplyDetail applyDetail:applyDetailList.stream()
			.filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList())) {
			applyDetail.setPrice(price);
			applyDetail.setFee(price.multiply(new BigDecimal(maxDays)));
			applyDetail.setStartTime(unionApplyBXDDTO.getStartTime());
			applyDetail.setEndTime(unionApplyBXDDTO.getEndTime());
			MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
			memberInsurance.setBdCode(unionApplyBXDDTO.getCode());
			memberInsurance.setRelationType(Constants.ZERO);
			memberInsuranceList.add(memberInsurance);
			//更新员工投保时间
			memberMapper.update(null,new UpdateWrapper<Member>()
			.lambda()
			.set(Member::getStartTime,memberInsurance.getStartTime())
			.set(Member::getEndTime,memberInsurance.getEndTime())
			.set(Member::getDuId,memberInsurance.getDuId())
			.set(Member::getWorktypeId,memberInsurance.getWorktypeId())
			.eq(Member::getId, memberInsurance.getMemberId())
			);

			}
			memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
			}
			@@ -813,6 +853,7 @@
			.set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
			.set(InsuranceApply::getEditDate,new Date())
			.set(InsuranceApply::getEditor,user.getId())
			.set(InsuranceApply::getServerCost,serverCost)
			.set(InsuranceApply::getCode,unionApplyBXDDTO.getCode())
			.eq(InsuranceApply::getId,insuranceApply.getId()));
			//更新投保单明细金额