productDev/yunyibao.git

			@@ -1,6 +1,8 @@
			package com.doumee.service.business.impl;

			import cn.hutool.core.util.IdcardUtil;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.extension.api.R;
			import com.doumee.biz.system.SystemDictDataBiz;
			import com.doumee.core.annotation.excel.ExcelExporter;
			import com.doumee.core.constants.ResponseStatus;
			@@ -12,12 +14,10 @@
			import com.doumee.core.utils.DateUtil;
			import com.doumee.core.utils.Utils;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.dto.ApplyChangeCyclePriceDTO;
			import com.doumee.dao.business.dto.ApplyChangeOptDTO;
			import com.doumee.dao.business.dto.CountCyclePriceDTO;
			import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
			import com.doumee.dao.business.dto.*;
			import com.doumee.dao.business.join.*;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.vo.ChangeDealTypeVO;
			import com.doumee.dao.business.vo.CountCyclePriceVO;
			import com.doumee.dao.system.model.SystemUser;
			import com.doumee.service.business.ApplyChangeService;
			@@ -25,6 +25,7 @@
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.doumee.service.business.SmsEmailService;
			import com.doumee.service.business.third.SignService;
			import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			@@ -105,6 +106,8 @@
			private SolutionsMapper solutionsMapper;

			@Autowired
			private SmsEmailService smsEmailService;
			@Autowired
			private NoticesMapper noticesMapper;
			/**
			* 平台退回投保
			@@ -135,13 +138,17 @@
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到方案信息");
			}

			if(
			// Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
			// \|\|Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())
			// \|\|
			Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
			//已提交和已完成状态不支持审核不通过
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
			if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
			//已提交和已完成状态不支持审核不通过
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}
			}else if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
			if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
			\|\| Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey()) ){
			//已提交和已完成状态不支持审核不通过
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}
			}
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			ApplyChange update = new ApplyChange();
			@@ -163,12 +170,14 @@
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
			Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
			insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
			// notices.setParam1(insuranceApply.getId().toString());
			noticesMapper.insert(notices);

			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
			String info =applyLogType.getInfo();
			info = info.replace("${param}", update.getCheckInfo());
			ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
			ApplyLog log = new ApplyLog(update,applyLogType.getName(),
			info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
			applyLogMapper.insert(log);
			return 1;

			@@ -187,17 +196,37 @@
			}

			ApplyChange model = applyChangeMapper.selectById(param.getId());
			InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
			if(Objects.isNull(insuranceApply)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保单信息");
			}
			if(model.getType().equals(Constants.ZERO)){
			if(param.getDelValidTime() == null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(!(param.getApplyStartTime().getTime()>insuranceApply.getStartTime().getTime()&&param.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批增日期必须处于保单申请日期内");
			}

			if(!(param.getDelValidTime().getTime()>insuranceApply.getStartTime().getTime()&&param.getDelValidTime().getTime()<=insuranceApply.getEndTime().getTime())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批减日期必须处于保单申请日期内");
			}
			}else{
			if(param.getApplyStartTime().getTime()<model.getApplyStartTime().getTime()){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单日期必须大于申请日期");
			}
			}
			if(model == null \|\|!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!Constants.equalsInteger(model.getType(),Constants.ONE)&&
			param.getDelValidTime() == null ){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}

			InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
			if(Objects.isNull(insuranceApply)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保单信息");
			}

			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			ApplyChange update = new ApplyChange();
			@@ -211,6 +240,7 @@
			update.setId(model.getId());
			update.setValidCode(param.getValidCode());
			update.setApplyStartTime(param.getApplyStartTime());
			update.setDelValidTime(param.getDelValidTime());
			update.setCode(model.getCode());

			param.getPidanFile().setIsdeleted(Constants.ZERO);
			@@ -237,6 +267,15 @@
			// throw new BusinessException(ResponseStatus.DATA_EMPTY);
			// }


			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
			if(model.getType().equals(Constants.ONE)){
			noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
			}
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));


			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
			String info = "";
			if(model.getValidTime()!=null && model.getValidTime().getTime()/1000!= param.getApplyStartTime().getTime()/1000){
			@@ -248,7 +287,7 @@
			applyLogMapper.insert(log);


			return 1;
			return model.getApplyId();

			}
			@Override
			@@ -316,7 +355,7 @@
			}

			/**
			* 处理加减保明细数据
			* 处理换厂明细数据
			* @param update
			*/
			private void dealDetailsDUdata(ApplyChange update,InsuranceApply insuranceApply) {
			@@ -347,7 +386,6 @@
			//实际批单生效日期
			Date applyStartTime = DateUtil.getMontageDate(update.getApplyStartTime(),1);
			for(ApplyChagneDetail detail : detailList){
			//查询减保人员是否存在冲突的保单明细数据
			if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
			.lambda()
			.eq(ApplyDetail::getApplyId,update.getApplyId())
			@@ -369,86 +407,117 @@
			if(oldModel == null ){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，用户【"+detail.getMemberName()+"】原保单信息有误，批单日期未在保单日期内！");
			}
			Date endDate = oldModel.getEndTime();

			MemberInsurance memberInsurance = new MemberInsurance(detail,update,update.getEditor(),null,insuranceApply.getSolutionId());
			memberInsurance.setSolutionId(detail.getSolutionId());
			memberInsurance.setWorktypeName(detail.getWorkTypeName());
			memberInsurance.setDuName(detail.getDuName());
			memberInsurance.setApplyChangeId(detail.getApplyChangeId());
			memberInsurance.setSolutionName(detail.getSolutionsName());
			memberInsurance.setPdCode(update.getValidCode());
			memberInsurance.setBdCode(insuranceApply.getCode());
			memberInsurance.setRelationType(Constants.ONE);
			memberInsurance.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
			memberInsurance.setRelationId(oldModel.getId());
			memberInsuranceJoinMapper.insert(memberInsurance);

			applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
			.set(ApplyDetail::getEditor,update.getEditor())
			.set(ApplyDetail::getEditDate,update.getEditDate())
			.set(ApplyDetail::getDuId,detail.getDuId())
			.set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
			.eq(ApplyDetail::getId,oldModel.getId())
			);
			memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
			.eq(MemberInsurance::getApplyId,update.getApplyId())
			.le(MemberInsurance::getStartTime,applyStartTime)
			.ge(MemberInsurance::getEndTime,applyStartTime)
			.set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,
			MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
			.set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,
			MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
			.ne(MemberInsurance::getId,memberInsurance.getId())
			// .eq(MemberInsurance::getRelationId,oldModel.getId())
			);

			//如果实际批单日期和原记录日期相等则直接修改记录派遣单位与工种信息
			if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
			//当前日期大于批单日期需要回滚数据实际数据
			Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getApplyStartTime(),2))>0;
			//换厂后历史记录的费用 fee
			Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getApplyStartTime(),3),DateUtil.getMontageDate(oldModel.getStartTime(),1))+1;
			BigDecimal oldFee = this.getApplyPrice(update.getApplyId(),days);
			BigDecimal fee = oldModel.getFee();
			BigDecimal oldCurrentFee = oldModel.getCurrentFee();

			applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
			.set(ApplyDetail::getEditor,update.getEditor())
			.set(ApplyDetail::getEditDate,update.getEditDate())
			.set(ApplyDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(),3))
			.set(ApplyDetail::getFee,oldFee)
			.set(flag,ApplyDetail::getCurrentFee,oldFee)
			.eq(ApplyDetail::getId,oldModel.getId())
			);

			//修改员工投保明细记录历史数据
			memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
			.set(MemberInsurance::getEndTime,update.getApplyStartTime())
			.set(MemberInsurance::getFee,oldFee)
			.eq(MemberInsurance::getRelationId,oldModel.getId())
			);

			ApplyDetail applyDetail = new ApplyDetail();
			applyDetail.setApplyId(oldModel.getApplyId());
			applyDetail.setCreateDate(new Date());
			applyDetail.setCreator(update.getEditor());
			applyDetail.setMemberId(oldModel.getMemberId());
			applyDetail.setIdcardNo(detail.getIdcardNo());
			applyDetail.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
			applyDetail.setMemberName(detail.getMemberName());
			applyDetail.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
			applyDetail.setEndTime(endDate);
			applyDetail.setDuId(detail.getDuId());
			applyDetail.setWorktypeId(detail.getWorktypeId());
			applyDetail.setIdcardNo(oldModel.getIdcardNo());
			applyDetail.setFee(fee.subtract(oldFee));
			applyDetail.setIsdeleted(Constants.ZERO);
			if(flag){
			applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
			}else{
			applyDetail.setCurrentFee(BigDecimal.ZERO);
			}
			applyDetail.setSex(oldModel.getSex());
			applyDetail.setMemberName(oldModel.getMemberName());
			applyDetail.setFromId(detail.getId());
			applyDetailJoinMapper.insert(applyDetail);

			MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
			memberInsurance.setSolutionId(detail.getSolutionId());
			memberInsurance.setWorktypeName(detail.getWorkTypeName());
			memberInsurance.setDuName(detail.getDuName());
			memberInsurance.setApplyChangeId(detail.getApplyChangeId());
			memberInsurance.setSolutionName(detail.getSolutionsName());
			memberInsurance.setPdCode(update.getValidCode());
			memberInsurance.setBdCode(insuranceApply.getCode());
			memberInsurance.setRelationType(Constants.ONE);
			memberInsuranceJoinMapper.insert(memberInsurance);
			}else{
			applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
			.set(ApplyDetail::getEditor,update.getEditor())
			.set(ApplyDetail::getEditDate,update.getEditDate())
			.set(ApplyDetail::getDuId,detail.getDuId())
			.set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
			.eq(ApplyDetail::getId,oldModel.getId())
			);
			//员工投保明细记录历史数据
			memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
			.set(MemberInsurance::getDuId,detail.getDuId())
			.set(MemberInsurance::getDuName,detail.getDuName())
			.set(MemberInsurance::getWorktypeId,detail.getWorktypeId())
			.set(MemberInsurance::getWorktypeName,detail.getWorkTypeName())
			.eq(MemberInsurance::getRelationId,oldModel.getId())
			);
			}
			// if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
			// //当前日期大于批单日期需要回滚数据实际数据
			// Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getApplyStartTime(),2))>0;
			// //换厂后历史记录的费用 fee
			// Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getApplyStartTime(),3),DateUtil.getMontageDate(oldModel.getStartTime(),1))+1;
			// BigDecimal oldFee = this.getApplyPrice(update.getApplyId(),days);
			// BigDecimal fee = oldModel.getFee();
			// BigDecimal oldCurrentFee = oldModel.getCurrentFee();
			//
			// applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
			// .set(ApplyDetail::getEditor,update.getEditor())
			// .set(ApplyDetail::getEditDate,update.getEditDate())
			// .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(),3))
			// .set(ApplyDetail::getFee,oldFee)
			// .set(flag,ApplyDetail::getCurrentFee,oldFee)
			// .eq(ApplyDetail::getId,oldModel.getId())
			// );
			//
			// //修改员工投保明细记录历史数据
			// memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
			// .set(MemberInsurance::getEndTime,update.getApplyStartTime())
			// .set(MemberInsurance::getFee,oldFee)
			// .eq(MemberInsurance::getRelationId,oldModel.getId())
			// );
			//
			// ApplyDetail applyDetail = new ApplyDetail();
			// applyDetail.setApplyId(oldModel.getApplyId());
			// applyDetail.setCreateDate(new Date());
			// applyDetail.setCreator(update.getEditor());
			// applyDetail.setMemberId(oldModel.getMemberId());
			// applyDetail.setIdcardNo(detail.getIdcardNo());
			// applyDetail.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
			// applyDetail.setMemberName(detail.getMemberName());
			// applyDetail.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
			// applyDetail.setEndTime(endDate);
			// applyDetail.setDuId(detail.getDuId());
			// applyDetail.setWorktypeId(detail.getWorktypeId());
			// applyDetail.setIdcardNo(oldModel.getIdcardNo());
			// applyDetail.setFee(fee.subtract(oldFee));
			// applyDetail.setIsdeleted(Constants.ZERO);
			// if(flag){
			// applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
			// }else{
			// applyDetail.setCurrentFee(BigDecimal.ZERO);
			// }
			// applyDetail.setSex(oldModel.getSex());
			// applyDetail.setMemberName(oldModel.getMemberName());
			// applyDetail.setFromId(detail.getId());
			// applyDetailJoinMapper.insert(applyDetail);
			//
			// MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
			// memberInsurance.setSolutionId(detail.getSolutionId());
			// memberInsurance.setWorktypeName(detail.getWorkTypeName());
			// memberInsurance.setDuName(detail.getDuName());
			// memberInsurance.setApplyChangeId(detail.getApplyChangeId());
			// memberInsurance.setSolutionName(detail.getSolutionsName());
			// memberInsurance.setPdCode(update.getValidCode());
			// memberInsurance.setBdCode(insuranceApply.getCode());
			// memberInsurance.setRelationType(Constants.ONE);
			// memberInsuranceJoinMapper.insert(memberInsurance);
			// }else{
			// applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
			// .set(ApplyDetail::getEditor,update.getEditor())
			// .set(ApplyDetail::getEditDate,update.getEditDate())
			// .set(ApplyDetail::getDuId,detail.getDuId())
			// .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
			// .eq(ApplyDetail::getId,oldModel.getId())
			// );
			// //员工投保明细记录历史数据
			// memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
			// .set(MemberInsurance::getDuId,detail.getDuId())
			// .set(MemberInsurance::getDuName,detail.getDuName())
			// .set(MemberInsurance::getWorktypeId,detail.getWorktypeId())
			// .set(MemberInsurance::getWorktypeName,detail.getWorkTypeName())
			// .eq(MemberInsurance::getRelationId,oldModel.getId())
			// );
			// }

			Member member = memberMapper.selectById(detail.getMemberId());
			if(Objects.isNull(member)){
			@@ -457,8 +526,8 @@
			member.setApplyId(update.getApplyId());
			member.setDuId(detail.getDuId());
			member.setWorktypeId(detail.getWorktypeId());
			member.setStartTime(detail.getStartTime());
			member.setEndTime(detail.getEndTime());
			// member.setStartTime(detail.getStartTime());
			// member.setEndTime(detail.getEndTime());
			memberMapper.updateById(member);

			applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
			@@ -494,39 +563,27 @@
			if (detailList == null \|\| detailList.size() == 0) {
			return;
			}
			List<ApplyDetail> addList = new ArrayList<>();
			List<Integer> reduceMembers = new ArrayList<>();
			BigDecimal totalFee = new BigDecimal(0);
			BigDecimal currentFee = new BigDecimal(0);
			//投保记录加保数据加入新数据减保数据修改老数据
			List<MemberInsurance> memberInsuranceList = new ArrayList<>();

			//加保业务使用的加保金额
			ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_add = new ApplyChangeCyclePriceDTO();
			applyChangeCyclePriceDTO_add.setApplyId(update.getApplyId());
			applyChangeCyclePriceDTO_add.setValidTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
			//加保添加的金额
			CountCyclePriceVO countCyclePriceVO_add = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_add);

			Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
			}
			if(solutions.getDataType().equals(Constants.ONE)){
			solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到方案最新版本信息");
			}
			}


			// if(solutions.getDataType().equals(Constants.ONE)){
			// solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
			// if(Objects.isNull(solutions)){
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到方案最新版本信息");
			// }
			// }
			for (ApplyChagneDetail detail : detailList) {
			Member member = memberMapper.selectById(detail.getMemberId());
			if(Objects.isNull(member)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到员工数据");
			}
			if (Constants.equalsInteger(detail.getType(), Constants.ZERO)) {

			//查询加保人员是否存在冲突的保单明细数据
			if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
			.lambda()
			@@ -537,8 +594,6 @@
			)>Constants.ZERO){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，加保人员【" + detail.getMemberName() + "】存在日期冲突的数据");
			}


			//加保
			ApplyDetail add = new ApplyDetail();
			add.setApplyId(update.getApplyId());
			@@ -554,17 +609,17 @@
			add.setIdcardNo(detail.getIdcardNo());
			add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
			add.setMemberName(detail.getMemberName());
			add.setRemark(detail.getRemark());
			add.setDuId(detail.getDuId());
			add.setStartTime(update.getApplyStartTime());
			add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
			add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
			add.setFee(countCyclePriceVO_add.getCyclePrice());

			add.setFee(Constants.addFee(solutions,solutions.getPrice(),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),update.getApplyStartTime(),insuranceApply.getEndTime()));

			if(new Date().compareTo(DateUtil.getMontageDate(detail.getStartTime(), 2))>=0){
			Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2), detail.getStartTime()) + 1;
			//如果已已产生费用，计算已已产生费用
			add.setCurrentFee(this.getApplyPrice(update.getApplyId(), days));
			//2024年5月8日17:37:23 修改计算产生费用
			add.setCurrentFee(
			Constants.produceFee(solutions,add.getFee(),add.getStartTime(),add.getEndTime(),add.getStartTime())
			);
			}else{
			add.setCurrentFee(BigDecimal.ZERO);
			}
			@@ -584,6 +639,10 @@
			.eq(ApplyChagneDetail::getId,detail.getId())
			);

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

			} else {
			//减保操作
			//查询员工是在主单下是否存在生效中的数据
			@@ -595,51 +654,57 @@
			if (oldModel == null \|\| oldModel.getStartTime() == null \|\| oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()) {
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，用户【" + detail.getMemberName() + "】原保单信息有误，当前申请不支持减保处理！");
			}
			//减保业务使用的减保金额
			ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_reduce = new ApplyChangeCyclePriceDTO();
			applyChangeCyclePriceDTO_reduce.setApplyId(update.getApplyId());
			applyChangeCyclePriceDTO_reduce.setValidTime(DateUtil.getMontageDate(update.getApplyStartTime(), 2));
			//减保需要减少的金额即退保需要退回的费用
			CountCyclePriceVO countCyclePriceVO_reduce = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_reduce);
			BigDecimal updateFee = countCyclePriceVO_reduce.getCyclePrice().multiply(new BigDecimal(-1));
			//当审批时间大于申请的时间时计算实际减少金额因为已扣金额会大于应扣金额
			BigDecimal updateCurrentFee = BigDecimal.ZERO;
			if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),update.getApplyStartTime()) > 0) {
			applyChangeCyclePriceDTO_reduce.setValidTime(DateUtil.getMontageDate(new Date(), 2));
			//获取大于审批日期导致多减的金额
			CountCyclePriceVO timeoutCountCyclePriceVOReduce = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_reduce);
			updateCurrentFee = timeoutCountCyclePriceVOReduce.getCyclePrice().subtract(countCyclePriceVO_reduce.getCyclePrice());
			if(!(oldModel.getStartTime().getTime()<update.getDelValidTime().getTime()&& oldModel.getEndTime().getTime()>=update.getDelValidTime().getTime())){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，用户【" + detail.getMemberName() + "】减保日期未在保单记录日期中！");
			}

			Date delValidTime = oldModel.getStartTime().compareTo(update.getDelValidTime())!=0?
			DateUtil.getMontageDate(update.getDelValidTime(), 3):
			DateUtil.getMontageDate(update.getDelValidTime(), 2);

			BigDecimal sumFee = Objects.isNull(insuranceApply.getServerCost())?
			solutions.getPrice():
			solutions.getPrice().add(insuranceApply.getServerCost());
			// 减保后总费用
			BigDecimal updateFee = Constants.reduceFee(
			solutions,
			sumFee
			,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
			) ;
			//当审批时间大于申请的时间时计算实际减少金额因为已扣金额会大于应扣金额
			BigDecimal updateCurrentFee = BigDecimal.ZERO;
			if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),oldModel.getStartTime()) > 0) {
			//// 2024年5月8日17:37:23 修改计算产生费用
			updateCurrentFee = Constants.produceFee(solutions,sumFee,insuranceApply.getStartTime(),insuranceApply.getEndTime(),
			oldModel.getStartTime()
			);
			}

			applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
			.setSql(" fee = ifnull(fee,0)+" + updateFee)
			.setSql(" fee = " + updateFee)
			.setSql(" current_fee = " + updateCurrentFee)
			.set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 3))
			.set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 2))
			.set(ApplyDetail::getEndTime, delValidTime)
			.set(ApplyDetail::getEditor, update.getEditor())
			.set(ApplyDetail::getEditDate, update.getEditDate())

			.eq(ApplyDetail::getId, oldModel.getId())
			);
			totalFee = totalFee.add(updateFee);
			totalFee = totalFee.add(updateFee).subtract(oldModel.getFee());
			currentFee = currentFee.add(updateCurrentFee);

			//修改员工投保明细记录历史数据
			memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
			.setSql(" fee = ifnull(fee,0)+" + updateFee)
			.set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
			.set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
			.set(MemberInsurance::getStartTime, update.getApplyStartTime())
			.setSql(" fee = " + updateFee)
			.set(MemberInsurance::getEndTime, delValidTime)
			.eq(MemberInsurance::getRelationId, oldModel.getId())
			);

			//修改业务明细行数据实际批单日期
			applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
			.set(ApplyChagneDetail::getFee,updateFee)
			.set(ApplyChagneDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
			.set(ApplyChagneDetail::getFee,updateFee.subtract(oldModel.getFee()))
			.set( ApplyChagneDetail::getEndTime, delValidTime)
			.eq(ApplyChagneDetail::getId,detail.getId())
			);

			}

			member.setApplyId(update.getApplyId());
			@@ -649,10 +714,11 @@
			member.setEndTime(detail.getEndTime());
			memberMapper.updateById(member);

			if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
			memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
			}
			}
			if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
			memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
			}

			if (totalFee.compareTo(new BigDecimal(0)) != 0) {
			//如果保单金额发生编码，更新总保单金额
			insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
			@@ -759,6 +825,11 @@
			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			public Integer create(ApplyChange applyChange) {
			if(applyChange.getType().equals(Constants.ZERO)){
			//2024年5月9日14:59:24 修改默认入当前天
			applyChange.setValidTime(DateUtil.getMontageDate(new Date(),1));
			}

			if (Objects.isNull(applyChange)
			\|\| Objects.isNull(applyChange.getApplyId())
			\|\| Objects.isNull(applyChange.getValidTime())
			@@ -776,7 +847,10 @@
			if (Objects.isNull(insuranceApply)) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if (!Constants.equalsInteger(insuranceApply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())) {
			if (!(Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
			\|\|Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey())
			)
			) {
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "保单状态错误");
			}
			if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO
			@@ -787,14 +861,12 @@
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
			}
			if(solutions.getDataType().equals(Constants.ONE)){
			solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到方案最新版本信息");
			}
			}


			// if(solutions.getDataType().equals(Constants.ONE)){
			// solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
			// if(Objects.isNull(solutions)){
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到方案最新版本信息");
			// }
			// }
			CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
			.eq(CompanySolution::getCompanyId,loginUserInfo.getCompanyId())
			.eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
			@@ -805,10 +877,10 @@
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到企业分配保险方案信息");
			}
			//申请时间必须处于保单的时间范围内
			if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
			&& DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "申请日期未处于保单日期内，无法进行该操作");
			}
			// if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
			// && DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "申请日期未处于保单日期内，无法进行该操作");
			// }
			//查询保单下是否存在进行中的加减保/换厂单据
			if(applyChangeMapper.selectCount(new QueryWrapper<ApplyChange>().lambda()
			.eq(ApplyChange::getApplyId,insuranceApply.getId())
			@@ -818,13 +890,31 @@
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "存在进行中的加减保/换厂申请");
			};


			applyChange.setCreateDate(new Date());
			applyChange.setCreator(loginUserInfo.getId());
			applyChange.setEditor(loginUserInfo.getId());
			applyChange.setEditDate(new Date());
			applyChange.setIsdeleted(Constants.ZERO);
			applyChange.setApplyStartTime(applyChange.getValidTime());
			//根据申请日期处理加减保的实际生效日期
			if(applyChange.getType().equals(Constants.ZERO)){
			if(Objects.nonNull(solutions.getAddValidDays())){
			applyChange.setApplyStartTime(
			DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getAddValidDays())
			);
			}else{
			applyChange.setApplyStartTime(applyChange.getValidTime());
			}
			if(Objects.nonNull(solutions.getDelValidDays())){
			applyChange.setDelValidTime(
			DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getDelValidDays())
			);
			}else{
			applyChange.setDelValidTime(applyChange.getValidTime());
			}
			}else{
			applyChange.setApplyStartTime(applyChange.getValidTime());
			}

			applyChange.setStatus(Constants.ZERO);
			applyChangeMapper.insert(applyChange);

			@@ -838,7 +928,10 @@
			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_COMPANY_COMMIT;
			ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),"",applyChange.getId(),applyLogType.getKey(), null, null);
			applyLogMapper.insert(log);


			// if(1==1){
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "存在进行中的加减保/换厂申请");
			// }

			return applyChange.getId();
			}
			@@ -876,7 +969,9 @@
			if (Objects.isNull(insuranceApply)) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if (!Constants.equalsInteger(insuranceApply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())) {
			if (!(Constants.equalsInteger(insuranceApply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
			\|\|Constants.equalsInteger(insuranceApply.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())
			)) {
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "保单状态错误");
			}
			if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO
			@@ -903,10 +998,10 @@
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到企业分配保险方案信息");
			}
			//申请时间必须处于保单的时间范围内
			if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
			&& DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "申请日期未处于保单日期内，无法进行该操作");
			}
			// if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
			// && DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "申请日期未处于保单日期内，无法进行该操作");
			// }
			//查询保单下是否存在进行中的加减保/换厂单据
			if(applyChangeMapper.selectCount(new QueryWrapper<ApplyChange>().lambda()
			.eq(ApplyChange::getApplyId,insuranceApply.getId())
			@@ -932,14 +1027,22 @@
			ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
			applyLogMapper.insert(log);

			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
			if(applyChange.getType().equals(Constants.ONE)){
			noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
			}
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));

			return applyChange.getId();
			}


			public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){


			if(Objects.nonNull(solutions.getDelOnlyReplace())&& solutions.getDelOnlyReplace().equals(Constants.ONE)){
			if(applyChange.getDelDetailList().size() > applyChange.getAddDetailList().size()){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案仅支持替换（减保人数不得大于加保人数）");
			}
			}
			//查询保险方案下的所有派遣单位
			List<DuSolution> duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
			.selectAll(DuSolution.class)
			@@ -953,7 +1056,6 @@
			if(!CollectionUtils.isNotEmpty(duSolutionList)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"数据异常：保险方案下未查询到派遣单位");
			}

			//查询所有派遣单位下的工种
			List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
			List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
			@@ -966,11 +1068,14 @@

			ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO = new ApplyChangeCyclePriceDTO();
			applyChangeCyclePriceDTO.setApplyId(insuranceApply.getId());


			//加保数据
			List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();

			if (CollectionUtils.isNotEmpty(addDetailList)) {
			if(companySolution.getCanAdd().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该企业分配保险方案无法进行加保");
			if(Objects.isNull(solutions.getCanAdd()) \|\| solutions.getCanAdd().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行加保");
			}
			//验证是否存在重复数据
			List<String> idcarNo = addDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
			@@ -980,12 +1085,16 @@
			}

			//加保明细数据计算金额根据批单时间计算
			applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),1));
			CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
			BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
			// applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),1));
			// CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
			// BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
			BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
			BigDecimal detailFee = Constants.addFee(solutions,
			sumPrice
			,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
			applyChange.getApplyStartTime(),insuranceApply.getEndTime());

			this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee);

			fee = addDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add);
			}

			@@ -998,21 +1107,29 @@
			if(idcarNo.size() != set.size()){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，人员录入数据存在相同数据！");
			}

			if(companySolution.getCanReduce().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该企业分配保险方案无法进行减保");
			if(Objects.isNull(solutions.getCanReduce()) \|\| solutions.getCanReduce().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行减保");
			}
			//减保明细数据计算金额根据批单时间前一天计算
			applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),2));
			CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
			BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
			this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee,applyChangeCyclePriceDTO.getValidTime());
			this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo, BigDecimal.ZERO,
			DateUtil.getMontageDate(applyChange.getDelValidTime(),3));
			fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
			}



			//换厂业务
			List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
			if (CollectionUtils.isNotEmpty(changeDetailList)) {
			if(Objects.isNull(solutions.getCanChangeUnit()) \|\| solutions.getCanChangeUnit().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行换厂操作");
			}
			//验证是否存在重复数据
			List<String> idcarNo = changeDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
			Set<String> set = new HashSet<>(idcarNo);
			if(idcarNo.size() != set.size()){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，人员录入数据存在相同数据！");
			}

			this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
			}
			return fee;
			@@ -1055,8 +1172,8 @@
			.lambda()
			.eq(ApplyDetail::getApplyId,applyChange.getApplyId())
			.eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
			.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
			.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
			.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
			.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
			)<=Constants.ZERO){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，减保人员【" + applyChagneDetail.getMemberName() + "】未查询到符合批单日期的数据");
			}
			@@ -1079,8 +1196,8 @@
			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.getApplyStartTime(),1))
			.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
			.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
			.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
			.orderByDesc(ApplyDetail::getCreateDate));
			if (applyDetailList.size() > Constants.ONE) {
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "减保人员【" + applyChagneDetail.getMemberName() + "】保单信息异常，存在多条数据");
			@@ -1089,23 +1206,42 @@
			if (applyChange.getValidTime().compareTo(applyDetail.getEndTime()) > 0) {
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "减保人员【" + applyChagneDetail.getMemberName() + "】保单保障日期至：【" + applyDetail.getEndTime() + "】无法通过本次申请");
			}
			applyChagneDetail.setPrice(applyDetail.getPrice());
			applyChagneDetail.setCreateDate(new Date());
			applyChagneDetail.setCreator(loginUserInfo.getId());
			applyChagneDetail.setIsdeleted(Constants.ZERO);
			applyChagneDetail.setApplyChangeId(applyChange.getId());
			applyChagneDetail.setType(Constants.ONE);

			applyChagneDetail.setApplyDetailId(applyDetail.getId());
			applyChagneDetail.setStartTime(applyDetail.getStartTime());
			applyChagneDetail.setEndTime(endTime);
			applyChagneDetail.setReduceMoney(BigDecimal.ZERO);

			member.setApplyId(insuranceApply.getId());
			member.setDuId(applyChagneDetail.getDuId());
			member.setWorktypeId(applyChagneDetail.getWorktypeId());
			member.setStartTime(applyChagneDetail.getStartTime());
			member.setEndTime(applyChagneDetail.getEndTime());
			member.setEndTime(applyDetail.getEndTime());
			memberMapper.updateById(member);
			//查询减保日期
			// Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
			// ;

			applyChagneDetail.setFee( detailFee.multiply(new BigDecimal(-1)));
			//查询周期数量
			applyChagneDetail.setFee(
			Constants.reduceFee(solutions,
			Objects.isNull(insuranceApply.getServerCost())?
			solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost()),
			insuranceApply.getStartTime(),
			insuranceApply.getFinalEndTime(),
			applyDetail.getStartTime(),endTime)
			.subtract(applyDetail.getFee()
			));
			//如果是减保业务为仅替换且方案的扣费周期和总周期相等则处理减保费用
			if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
			&& Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
			applyChagneDetail.setReduceMoney(solutions.getPrice().multiply(new BigDecimal(-1)));
			}
			applyChagneDetailJoinMapper.insert(applyChagneDetail);
			}
			}
			@@ -1142,6 +1278,13 @@
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，加保人员【" + applyChagneDetail.getMemberName() + "】存在日期冲突的数据");
			}

			ApplyDetail applyDetail = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>()
			.lambda()
			.eq(ApplyDetail::getApplyId,applyChange.getApplyId()).last("limit 1"));
			if(Objects.isNull(applyDetail)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "保单中未存在明细记录");
			}
			applyChagneDetail.setPrice(applyDetail.getPrice());
			applyChagneDetail.setCreateDate(new Date());
			applyChagneDetail.setCreator(loginUserInfo.getId());
			applyChagneDetail.setIsdeleted(Constants.ZERO);
			@@ -1166,6 +1309,9 @@
			member.setName(applyChagneDetail.getMemberName());
			member.setCompanyId(insuranceApply.getCompanyId());
			member.setSex(Constants.getSexByIdCard(applyChagneDetail.getIdcardNo()));
			if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"加保员工信息身份证信息错误["+member.getName()+"]");
			}
			member.setIdcardNo(applyChagneDetail.getIdcardNo());
			member.setApplyId(insuranceApply.getId());
			member.setDuId(applyChagneDetail.getDuId());
			@@ -1311,6 +1457,7 @@
			&& applyChagneDetail.getOldWorktypeId().equals(applyChagneDetail.getWorktypeId())){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "换厂人员【" + applyChagneDetail.getMemberName() + "】换厂数据相同！");
			}
			applyChagneDetail.setPrice(applyDetail.getPrice());
			applyChagneDetail.setCreateDate(new Date());
			applyChagneDetail.setCreator(loginUserInfo.getId());
			applyChagneDetail.setIsdeleted(Constants.ZERO);
			@@ -1466,10 +1613,11 @@
			Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
			Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
			.eq(!Objects.isNull(model.getUnionApplyId()),InsuranceApply::getUnionApplyId,model.getUnionApplyId())
			// .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
			.eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
			.eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
			.eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
			.eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
			.like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
			.ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
			.le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" )
			.ge(StringUtils.isNotBlank(model.getApplyStartS()),ApplyChange::getApplyStartTime, model.getApplyStartS()+" 00:00:00" )
			@@ -1481,11 +1629,11 @@
			}else if(loginUserInfo.getType().equals(Constants.TWO)){
			//如果是商户查看
			if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==0){
			queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
			queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 AND cs.SOLUTION_ID = t1.SOLUTION_ID and cs.shop_id="+loginUserInfo.getCompanyId());
			}else if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==1){
			queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
			}else{
			queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
			queryWrapper.apply("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 AND cs.SOLUTION_ID = t1.SOLUTION_ID and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
			"t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
			}
			}else{
			@@ -1499,15 +1647,110 @@

			queryWrapper.orderByDesc(ApplyDetail::getCreateDate);

			// for(PageWrap.SortData sortData: pageWrap.getSorts()) {
			// if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
			// queryWrapper.orderByDesc(sortData.getProperty());
			// } else {
			// queryWrapper.orderByAsc(sortData.getProperty());
			// }
			// }
			PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
			return pageData;
			}

			@Override
			public List<ApplyChange> findListForCompany(ApplyChange model) {
			MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper
			.selectAll(ApplyChange.class)
			.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
			.selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
			.selectAs(InsuranceApply::getCode,ApplyChange::getValidCode)
			.selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
			.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
			.selectAs(Solutions::getType,ApplyChange::getSolutionType)
			.selectAs(Company::getName,ApplyChange::getCompanyName)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
			.select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID )",ApplyChange::getChangeMoney)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
			.eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
			.in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),
			ApplyChange::getStatus,
			Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
			Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
			.eq(!Objects.isNull(model.getUnionApplyId()),InsuranceApply::getUnionApplyId,model.getUnionApplyId())
			// .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
			.eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
			.eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
			.eq(!Objects.isNull(model.getUnionChangeId()),ApplyChange::getUnionChangeId,model.getUnionChangeId())
			.eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
			.like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
			.ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
			.le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" )
			.ge(StringUtils.isNotBlank(model.getApplyStartS()),ApplyChange::getApplyStartTime, model.getApplyStartS()+" 00:00:00" )
			.le(StringUtils.isNotBlank(model.getApplyStartE()),ApplyChange::getApplyStartTime, model.getApplyStartE()+" 23:59:59" );
			LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			//企业人员查看本企业数据
			if(loginUserInfo.getType().equals(Constants.ONE)){
			queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
			}else if(loginUserInfo.getType().equals(Constants.TWO)){
			//如果是商户查看
			if(model.getSolutionType()!=null && model.getSolutionType() ==0){
			queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
			}else if(model.getSolutionType()!=null && model.getSolutionType() ==1){
			queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
			}else{
			queryWrapper.apply("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
			"t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
			}
			}else{
			if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
			queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
			}else{
			queryWrapper.eq(InsuranceApply::getCompanyId, -1);
			}
			queryWrapper.eq(model.getCompanyId()!=null,InsuranceApply::getCompanyId, model.getCompanyId());
			}

			queryWrapper.orderByDesc(ApplyDetail::getCreateDate);
			List<ApplyChange> list =applyChangeJoinMapper.selectJoinList(ApplyChange.class,queryWrapper);
			if(Constants.equalsObject(model.getGetFiles(),Constants.ONE)){
			//如果是合并单,需要查询附件信息
			initFileForList(list);
			}
			return list;
			}
			private void initFileForList(List<ApplyChange> list) {
			List<Integer> objList = new ArrayList<>();
			if(list!=null && list.size()>0){
			for(ApplyChange param : list){
			objList.add(param.getId());
			}
			}else{
			return;
			}
			List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
			.in(Multifile::getObjId,objList)
			.in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.CA_PD_PDF.getKey()}))
			.eq(Multifile::getIsdeleted,Constants.ZERO)
			.orderByAsc(Multifile::getId));
			if(multifiles!=null && multifiles.size()>0){
			String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
			+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
			for(ApplyChange model : list){
			for(Multifile f : multifiles) {
			if (StringUtils.isBlank(f.getFileurl())) {
			continue;
			}
			f.setFileurlFull(path+f.getFileurl());
			if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
			if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())) {
			//签署前的投保单
			model.setPidanFile(f);
			}
			}
			}
			}
			}

			}


			@@ -1565,7 +1808,12 @@
			Notices notices = new Notices(noticeObjectType,Constants.ZERO,applyChange.getId(),solutions.getName(),
			insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
			noticesMapper.insert(notices);

			//商户待办
			if(Objects.nonNull(solutions.getShopId())){
			Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
			applyChange.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
			noticesMapper.insert(shopNotices);
			}

			}else if(applyChangeOptDTO.getOptType().equals(4)){
			applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
			@@ -1597,14 +1845,11 @@
			}else if(applyChangeOptDTO.getOptType().equals(6)){
			//企业关闭
			applyLogType = Constants.ApplyLogType.CA_COMPANY_CLOSE;
			if(!loginUserInfo.getType().equals(Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业端用户无法进行该操作");
			}
			if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
			if(!(applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())
			\|\|applyChange.getStatus().equals(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()))){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态错误无法进行该操作!");
			}
			applyChange.setStatus(Constants.ApplyChangeStatus.CLOSE.getKey());

			//存储待办信息
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
			@@ -1632,14 +1877,17 @@
			MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.selectAll(ApplyChange.class)
			.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
			.selectAs(Company::getId,ApplyChange::getCompanyId)
			.selectAs(Company::getName,ApplyChange::getCompanyName)
			.selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
			.selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
			.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
			.selectAs(Solutions::getType,ApplyChange::getSolutionType)
			.selectAs(Solutions::getId,ApplyChange::getSolutionsId)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
			.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.apply_id and ac.status = 2 ) as lastChangeDate")
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			@@ -1662,10 +1910,10 @@
			applyChange.setApplyLogList(applyLogList);

			List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
			.eq(Multifile::getObjId,Constants.equalsInteger(applyChange.getSolutionType(),Constants.ZERO)? applyChange.getId():applyChange.getUnionChangeId())
			.in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
			,Constants.MultiFile.CA_PD_PDF.getKey()
			,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))
			.eq(Multifile::getObjId, applyChange.getId() )
			// .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
			// ,Constants.MultiFile.CA_PD_PDF.getKey()
			// ,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))
			.eq(Multifile::getIsdeleted,Constants.ZERO));
			if(multifiles!=null){
			String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
			@@ -1738,9 +1986,9 @@
			}
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			Company company = user.getCompany();
			if(debugModel){
			/*if(debugModel){
			company = companyMapper.selectById(model.getCompanyId());
			}
			}*/
			if(company== null \|\| StringUtils.isBlank( company.getEmail()) \|\| !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，企业尚未具备在线签章条件，请联系平台管理员确认~");
			}
			@@ -1888,23 +2136,29 @@
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息");
			}
			ApplyDetail applyDetail = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getIsdeleted,Constants.ZERO).eq(ApplyDetail::getApplyId,insuranceApply.getId()).last("limit 1"));
			if(Objects.isNull(applyDetail)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保单明细记录");
			}
			//根据批单日期和结束日期计算金额
			//验证批单日期是否在当前日期后且在保单结束日期前申请时间必须处于保单的时间范围内
			if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChangeCyclePriceDTO.getValidTime()) >= Constants.ZERO
			&& DateUtil.compareDate( applyChangeCyclePriceDTO.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "申请日期未处于保单日期内，无法进行该操作");
			}
			//总天数
			Integer sumDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()) + 1;
			//加减保到结束的天数
			Integer optDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),applyChangeCyclePriceDTO.getValidTime()) + 1;

			CountCyclePriceVO countCyclePriceVO = Constants.countPriceVO(insuranceApply.getStartTime(),solutions);
			//总金额
			BigDecimal sumPrice = countCyclePriceVO.getCyclePrice();
			// if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChangeCyclePriceDTO.getValidTime()) >= Constants.ZERO
			// && DateUtil.compareDate( applyChangeCyclePriceDTO.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "申请日期未处于保单日期内，无法进行该操作");
			// }
			BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
			CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
			//加减保金额
			returnCountCyclePriceVO.setCyclePrice(sumPrice.multiply(new BigDecimal(optDays)).divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP));
			returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
			sumPrice
			,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
			DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays()),insuranceApply.getEndTime()));
			BigDecimal reducePrice = solutions.getPrice().subtract(Constants.reduceFee(solutions,
			sumPrice
			,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime()
			,insuranceApply.getStartTime(),
			DateUtil.getMontageDate(
			DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getDelValidDays()),3)));
			returnCountCyclePriceVO.setReducePrice(reducePrice);
			return returnCountCyclePriceVO;
			}

			@@ -1967,22 +2221,27 @@
			* 人员名单签章
			*/
			@Override
			public String getChangeMemberListOnlineSignLink(Integer applyChangeId) {
			ApplyChange model = this.queryApplyChangeData(applyChangeId);
			public String getChangeMemberListOnlineSignLink(SmsCheckDTO smsCheckDTO) {
			if(Objects.isNull(smsCheckDTO)
			\|\| Objects.isNull(smsCheckDTO.getBusinessId())
			// \|\| StringUtils.isBlank(smsCheckDTO.getCode())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			//验证验证码
			// if(!debugModel){
			// smsEmailService.validateCode(smsCheckDTO.getCode());
			// }
			ApplyChange model = this.queryApplyChangeData(smsCheckDTO.getBusinessId());
			if(Objects.isNull(model)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询加减保信息");
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询加减保/换厂信息");
			}
			if(Objects.isNull(model) \|\|! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该申请状态已流转，当前不支持签章操作！");
			}

			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			Company company = user.getCompany();
			if(debugModel){
			company = companyMapper.selectById(model.getCompanyId());
			}
			Company company = companyMapper.selectById(model.getCompanyId());
			if(company== null \|\| StringUtils.isBlank( company.getEmail()) \|\| !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，企业尚未具备在线签章条件，请联系平台管理员确认~");
			}
			@@ -1990,36 +2249,178 @@
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息");
			}
			if(solutions.getType().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，非委托保方案保单，无法进行该操作!");
			}
			String fileUrl = null;
			if(Constants.equalsObject(model.getType(), Constants.ONE)){
			fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"换厂申请表","被保险人");
			if(solutions.getType().equals(Constants.ONE)){
			if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该申请状态已流转，当前不支持签章操作！");
			}
			if(Constants.equalsObject(model.getType(), Constants.ONE)){
			fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"换厂申请表","被保险人");
			}else{
			fileUrl = ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcelToPdf(model,"加减保申请表","被保险人");
			}
			String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
			notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
			String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"人员名单签章",company.getSignId(),notifyUrl);
			if(StringUtils.isBlank(applyNo) ){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！");
			}
			String link = signService.signLink(applyNo,company.getName(),company.getCode());
			if(StringUtils.isBlank(link) ){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！");
			}
			ApplyChange update= new ApplyChange();
			update.setId(model.getId());
			update.setEditor(user.getId());
			update.setEditDate(new Date());
			update.setSignMemberListNo(applyNo);
			applyChangeMapper.updateById(update);
			return link;
			}else{
			fileUrl = ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcelToPdf(model,"加减保申请表","被保险人");
			if(model.getType().equals(Constants.ONE)){
			return this.getSignLinkChangeUnit(model);
			}else{
			return this.getSignLinkJiajiabao(model);
			}



			}
			String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
			notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
			String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"人员名单签章",company.getSignId(),notifyUrl);
			if(StringUtils.isBlank(applyNo) ){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！");
			}



			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			public Integer check(ApplyChange applyChange) {
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(!user.getType().equals(Constants.TWO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户端无法进行该操作");
			}
			String link = signService.signLink(applyNo,company.getName(),company.getCode());
			if(StringUtils.isBlank(link) ){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！");
			if(applyChange.getId() == null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(Objects.isNull(applyChange)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			ApplyChange update= new ApplyChange();
			update.setId(model.getId());
			update.setEditor(user.getId());
			ApplyChange model = applyChangeJoinMapper.selectJoinOne(ApplyChange.class,
			new MPJLambdaWrapper<ApplyChange>()
			.selectAll(ApplyChange.class)
			.selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.eq(ApplyChange::getId,applyChange.getId())
			.last(" limit 1")
			);

			if(model == null \|\|!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息");
			}
			if(solutions.getType().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"直保单据无法进行该操作");
			}else{
			if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}
			}

			ApplyChange update = new ApplyChange();
			update.setEditDate(new Date());
			update.setSignMemberListNo(applyNo);
			applyChangeMapper.updateById(update);
			return link;
			update.setEditor(user.getId());
			update.setCheckDate(update.getEditDate());
			update.setCheckInfo(applyChange.getCheckInfo());
			update.setCheckUserId(user.getId());
			update.setId(model.getId());
			if(applyChange.getDealBackApply() ==1){
			//如果是不通过
			update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
			}else{
			update.setStatus(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey());
			}
			applyChangeJoinMapper.updateById(update);


			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_AUDIT;
			String info = applyChange.getCheckInfo();
			if(StringUtils.isNotBlank(applyChange.getCheckInfo())){
			info = info.replace("${param}", applyChange.getCheckInfo());
			}else{
			info = info.replace("${param}", "");
			}
			ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), null, null);
			applyLogMapper.insert(log);

			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
			if(Constants.equalsInteger(model.getType(),Constants.ONE)){
			noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
			}
			//删除全部待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda()
			.eq(Notices::getObjType, noticeObjectType.getKey())
			.eq(Notices::getObjId, model.getId()));
			return 1;

			}




			// BigDecimal cycle1 = new BigDecimal(days).divide(insureCycleUnit.getDays(),0,RoundingMode.CEILING);
			//
			// if(solutions.getTimeUnit().equals(Constants.TimeUnit.MONTH.getValue())){
			// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
			// }else{
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"方案配置错误");
			// }
			// }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.QUARTER.getValue())){
			// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(6),2, RoundingMode.HALF_UP);
			// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
			// return fee.multiply(cycle).divide(new BigDecimal(3),2, RoundingMode.HALF_UP);
			// }else{
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"方案配置错误");
			// }
			// }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.HALF_YEAR.getValue())){
			// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(12),2, RoundingMode.HALF_UP);
			// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
			// return fee.multiply(cycle).divide(new BigDecimal(6),2, RoundingMode.HALF_UP);
			// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())){
			// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
			// cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
			// }else{
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"方案配置错误");
			// }
			// }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.YEAR.getValue())){
			// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(24),2, RoundingMode.HALF_UP);
			// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
			// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
			// return fee.multiply(cycle).divide(new BigDecimal(12),2, RoundingMode.HALF_UP);
			// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())){
			// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
			// cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(4),2, RoundingMode.HALF_UP);
			// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())){
			// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
			// cycle = cycle.divide(new BigDecimal(6),0,RoundingMode.CEILING);
			// return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
			// }else{
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"方案配置错误");
			// }
			// }else{
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"方案配置错误");
			// }

			}