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;
			@@ -93,11 +95,15 @@
			@Autowired
			private MemberMapper memberMapper;
			@Autowired
			private MemberJoinMapper memberJoinMapper;
			@Autowired
			private DuSolutionMapper duSolutionMapper;
			@Autowired
			private DuSolutionJoinMapper duSolutionJoinMapper;
			@Autowired
			private DuWorktypeMapper duWorktypeMapper;
			@Autowired
			private DuWorkTypeJoinMapper duWorkTypeJoinMapper;

			@Autowired
			private NoticesMapper noticesMapper;
			@@ -105,6 +111,8 @@
			private UnionApplyJoinMapper unionApplyJoinMapper;
			@Autowired
			private UnionChangeJoinMapper unionChangeJoinMapper;
			@Autowired
			private CompanySolutionMapper companySolutionMapper;

			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			@@ -113,24 +121,31 @@
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());

			if(model == null \|\|!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}

			Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息");
			}

			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			InsuranceApply update = new InsuranceApply();
			if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
			if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}
			update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
			}else{
			if( !(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
			\|\| Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
			\|\| Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()))){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}
			update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
			}

			update.setEditDate(new Date());
			update.setEditor(user.getId());
			update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
			update.setCheckDate(update.getEditDate());
			update.setCheckInfo(insuranceApply.getCheckInfo());
			update.setCheckUserId(user.getId());
			@@ -226,11 +241,17 @@
			update.setCode(insuranceApply.getCode());
			update.setEndTime(actEndTime);
			update.setStartTime(insuranceApply.getStartTime());
			CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
			countCyclePriceDTO.setSolutionsId(model.getSolutionId());
			countCyclePriceDTO.setStartDate(insuranceApply.getStartTime());
			update.setFinalEndTime(this.getCountCyclePriceVO(countCyclePriceDTO).getEndDate());
			insuranceApplyMapper.updateById(update);

			//修改明细行的开始结束日期
			applyDetailMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda().set(ApplyDetail::getStartTime,insuranceApply.getStartTime())
			.set(ApplyDetail::getEndTime,actEndTime).eq(ApplyDetail::getApplyId,model.getId()));
			applyDetailMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
			.set(ApplyDetail::getStartTime,insuranceApply.getStartTime())
			.set(ApplyDetail::getEndTime,actEndTime)
			.eq(ApplyDetail::getApplyId,model.getId()));

			multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
			.eq(Multifile::getIsdeleted,Constants.ZERO)
			@@ -249,6 +270,10 @@
			insuranceApply.getBaoxiandanFile().setType(Constants.TWO);
			multifileMapper.insert(insuranceApply.getBaoxiandanFile());
			update.setBaoxiandanFile(insuranceApply.getBaoxiandanFile());

			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,Constants.NoticeObjectType.INSURANCE_APPLY.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,insuranceApply.getId()));

			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD_INSURANCE;
			String info = "";
			@@ -286,10 +311,21 @@
			MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
			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);
			}

			this.updateApplyCurrentFee(insuranceApply.getId(),null);
			return 1;
			}

			@@ -369,6 +405,11 @@
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			Constants.ApplyLogType applyLogType = null;
			String info = "";
			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
			//处理退回申请通知
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,insuranceApply.getId()));
			InsuranceApply update = new InsuranceApply();
			if(insuranceApply.getDealBackApply() ==1){
			//如果是驳回,只能可驳回已签章状态下的退回申请状态进行操作
			@@ -400,6 +441,15 @@
			}
			applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK;
			update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());


			//通知企业已退回
			Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
			if(Objects.nonNull(solutions)){
			Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
			insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
			noticesMapper.insert(notices);
			}
			}
			update.setEditDate(new Date());
			update.setEditor(user.getId());
			@@ -408,6 +458,7 @@
			update.setCheckUserId(user.getId());
			update.setId(model.getId());
			insuranceApplyMapper.updateById(update);


			ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
			applyLogMapper.insert(log);
			@@ -473,6 +524,8 @@
			update.setId(model.getId());
			update.setEditor(user.getId());
			update.setEditDate(new Date());
			update.setCheckUserId(user.getId());
			update.setCheckDate(new Date());
			update.setSignApplyNo(applyNo);
			insuranceApplyMapper.updateById(update);
			return link;
			@@ -517,8 +570,22 @@
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,model.getId()));
			//平台待办
			Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
			noticesMapper.insert(notices);

			CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
			.eq(CompanySolution::getIsdeleted,Constants.ZERO)
			.eq(CompanySolution::getSolutionId,model.getSolutionId())
			.eq(CompanySolution::getCompanyId,model.getCompanyId())
			.last("limit 1")
			);
			//商户待办
			if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
			Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
			model.getId(),model.getSolutionsName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
			noticesMapper.insert(shopNotices);
			}

			Multifile f = new Multifile();
			f.setIsdeleted(Constants.ZERO);
			@@ -550,11 +617,9 @@
			public Multifile uploadFAQRSSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
			InsuranceApply update = new InsuranceApply();
			update.setEditDate(new Date());
			update.setEditor(model.getCreator());
			update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey());
			update.setCheckDate(update.getEditDate());
			update.setCheckInfo("企业完成签署方案确认书");
			update.setCheckUserId(model.getCreator());
			update.setId(model.getId());
			insuranceApplyMapper.updateById(update);

			@@ -572,7 +637,7 @@
			multifileMapper.insert(f);

			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS;
			ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
			ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
			,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
			applyLogMapper.insert(log);
			return f;
			@@ -601,7 +666,7 @@
			f.setCreator(model.getCreator());
			f.setObjId(update.getId());
			f.setCreateDate(update.getEditDate());
			f.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey());
			f.setObjType(Constants.MultiFile.BD_SIGNED_PDF.getKey());
			f.setType(Constants.TWO);
			f.setFileurl(fileurl);
			f.setFileurlFull(fullUrl);
			@@ -626,7 +691,6 @@
			public Multifile uploadApplyMemberListSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
			InsuranceApply update = new InsuranceApply();
			update.setEditDate(new Date());
			update.setEditor(model.getCreator());
			update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey());
			update.setCheckDate(update.getEditDate());
			update.setCheckInfo("企业完成签署人员名单");
			@@ -648,10 +712,24 @@
			multifileMapper.insert(f);



			//数据日志
			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
			ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
			ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
			,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
			applyLogMapper.insert(log);

			Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
			//待办通知
			if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
			Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
			solutions.getShopId(), Constants.NoticeType.SEVEN);
			notices.setParam1(model.getId().toString());
			noticesMapper.insert(notices);
			}


			return f;
			}

			@@ -682,6 +760,15 @@
			notices.setParam1(model.getApplyId().toString());
			noticesMapper.insert(notices);

			Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
			//商户待办
			if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
			Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
			model.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.TWO);
			notices.setParam1(model.getApplyId().toString());
			noticesMapper.insert(shopNotices);
			}

			Multifile f = new Multifile();
			f.setIsdeleted(Constants.ZERO);
			f.setCreator(model.getCreator());
			@@ -708,7 +795,7 @@
			ApplyChange update = new ApplyChange();
			update.setEditDate(new Date());
			update.setEditor(model.getCreator());
			update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
			update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
			update.setCheckDate(update.getEditDate());
			update.setCheckInfo("企业完成签署人员名单");
			update.setCheckUserId(model.getCreator());
			@@ -720,7 +807,11 @@
			f.setCreator(model.getCreator());
			f.setObjId(update.getId());
			f.setCreateDate(update.getEditDate());
			f.setObjType(Constants.MultiFile.CHANGE_MEMBER_LIST_LATTER.getKey());
			if(model.getType().equals(Constants.ZERO)){
			f.setObjType(Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey());
			}else{
			f.setObjType(Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey());
			}
			f.setType(Constants.TWO);
			f.setFileurl(fileurl);
			f.setFileurlFull(fullurl);
			@@ -732,6 +823,19 @@
			ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
			applyLogMapper.insert(log);


			Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
			//待办通知
			if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
			if(model.getType().equals(Constants.ONE)){
			noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
			}
			Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
			solutions.getShopId(), Constants.NoticeType.SEVEN);
			notices.setParam1(model.getApplyId().toString());
			noticesMapper.insert(notices);
			}
			return f;
			}

			@@ -799,8 +903,8 @@
			f.setType(Constants.TWO);
			f.setFileurl(fileurl);
			f.setFileurlFull(fullUrl);
			f.setInfo("委托加减保/换厂业务 -投保单");
			f.setName("委托加减保/换厂业务 -投保单.pdf");
			f.setInfo("投保申请单 -申请单");
			f.setName("投保申请单.pdf");
			multifileMapper.insert(f);

			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD;
			@@ -958,6 +1062,7 @@
			.selectAll(ApplyChange.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Solutions::getId,ApplyChange::getSolutionsId)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			@@ -983,11 +1088,13 @@
			}
			}

			//委托保加减保/换厂签署人员名单
			chagneList = applyChangeMapper.selectJoinList(ApplyChange.class,
			new MPJLambdaWrapper<ApplyChange>()
			.selectAll(ApplyChange.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Solutions::getId,ApplyChange::getSolutionsId)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			@@ -1067,216 +1174,350 @@

			}
			@Override
			public void dealSignResult(NotifyDataReq data){
			public String dealSignResult(NotifyDataReq data){
			if(data.getApplyNo() == null ){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )
			\|\| Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
			//如果已保全,可下载签约附件
			String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
			systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
			//直保投保申请
			InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ZERO)
			.eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
			.last("limit 1" ));
			if(model != null && Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
			String r = dealXBTBBiz(path,data,"直保-投保申请签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealWTBQYQRSBiz(path,data,"委托保-企业方案确认书签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealWTBQYRYMQDBiz(path,data,"委托保-企业人员名单签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealWTBTBSQBiz(path,data,"委托保-投保申请书签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealZBJJBQYBiz(path,data,"直保-加减保企业签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealWTBJJBQYBiz(path,data,"委托保-加减保企业签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealHBDSHBiz(path,data,"投保合并单-商户签署签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			r = dealHBCHANGEQYBiz(path,data,"合并加减保/换厂签署");
			if(StringUtils.isNotBlank(r)){
			return r;
			}
			}
			return "无处理数据";
			}

			private String dealHBCHANGEQYBiz(String path, NotifyDataReq data, String title) {
			UnionChange unionChange = unionChangeJoinMapper.selectOne(
			new MPJLambdaWrapper<UnionChange>()
			.selectAll(UnionChange.class)
			.eq(UnionChange::getSignApplyNo,data.getApplyNo())
			.last(" limit 1 "));
			if(unionChange == null){
			return null;
			}
			if( Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String link = signService.linkFile(unionChange.getSignApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadSignedFileDo(model,fileUrl,path+fileUrl);
			return;
			}
			//委托保企业方案确认书
			InsuranceApply modelTBQRS = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(InsuranceApply::getSignQrsNo,data.getApplyNo())
			.last("limit 1" ));
			if(modelTBQRS != null && Constants.equalsInteger(modelTBQRS.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadFAQRSSignedFileDo(modelTBQRS,fileUrl,path+fileUrl);
			return;
			}



			//委托保企业签署人员名单
			InsuranceApply modelMemberList = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(InsuranceApply::getSignMemberListNo,data.getApplyNo())
			.last("limit 1" ));
			if(modelMemberList != null && Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadApplyMemberListSignedFileDo(modelMemberList,fileUrl,path+fileUrl);
			return;
			}


			//委托保投保申请书签署
			InsuranceApply modelTBQSQ = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(InsuranceApply::getApplyTbdNo,data.getApplyNo())
			.last("limit 1" ));
			if(modelTBQRS != null && Constants.equalsInteger(modelTBQSQ.getUnionApplyTbdStatus(),Constants.ONE)){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadTBSQSSignedFileDo(modelTBQSQ,fileUrl,path+fileUrl);
			return;
			}

			//直保加减保企业签署
			ApplyChange applyChange = applyChangeMapper.selectJoinOne(ApplyChange.class,
			new MPJLambdaWrapper<ApplyChange>()
			.selectAll(ApplyChange.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ZERO)
			.eq(ApplyChange::getSignApplyNo,data.getApplyNo()).last("limit 1" ));
			if(applyChange != null &&Constants.equalsInteger(applyChange.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
			}

			//委托保加减保企业签署
			ApplyChange applyChangeMemberList = applyChangeMapper.selectJoinOne(ApplyChange.class,
			new MPJLambdaWrapper<ApplyChange>()
			.selectAll(ApplyChange.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(ApplyChange::getSignMemberListNo,data.getApplyNo()).last("limit 1" ));
			if(applyChangeMemberList != null &&Constants.equalsInteger(applyChangeMemberList.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
			}


			//投保合并单商户签署保单
			UnionApply unionApply = unionApplyJoinMapper.selectOne(new QueryWrapper<UnionApply>()
			.lambda().eq(UnionApply::getSignApplyNo,data.getApplyNo()).last(" limit 1 "));
			if(unionApply != null &&Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			}
			uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
			}


			/**
			*合并加减保换厂签署业务
			*/
			UnionChange unionChange = unionChangeJoinMapper.selectOne(
			new MPJLambdaWrapper<UnionChange>()
			.selectAll(UnionChange.class)
			.eq(UnionChange::getSignApplyNo,data.getApplyNo())
			.last(" limit 1 "));
			if(unionChange != null &&Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
			String link = signService.linkFile(model.getSignApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return;
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
			.set(UnionChange::getSignApplyNo,null)
			.eq(UnionChange::getSignApplyNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}
			}
			return title+"状态已流转，不做处理";
			}

			private String dealHBDSHBiz(String path, NotifyDataReq data, String title) {
			//投保合并单商户签署保单
			UnionApply unionApply = unionApplyJoinMapper.selectOne(new QueryWrapper<UnionApply>()
			.lambda().eq(UnionApply::getSignApplyNo,data.getApplyNo()).last(" limit 1 "));
			if(unionApply == null){
			return null;
			}
			if( Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			unionApplyJoinMapper.update(null,new UpdateWrapper<UnionApply>().lambda()
			.set(UnionApply::getSignApplyNo,null)
			.eq(UnionApply::getSignApplyNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}
			}
			return title+"状态已流转，不做处理";

			}

			private String dealWTBJJBQYBiz(String path, NotifyDataReq data, String title) {
			//委托保加减保企业签署
			ApplyChange applyChangeMemberList = applyChangeMapper.selectJoinOne(ApplyChange.class,
			new MPJLambdaWrapper<ApplyChange>()
			.selectAll(ApplyChange.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Solutions::getId,ApplyChange::getSolutionsId)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(ApplyChange::getSignMemberListNo,data.getApplyNo()).last("limit 1" ));
			if(applyChangeMemberList == null){
			return null;
			}
			if( Constants.equalsInteger(applyChangeMemberList.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
			.set(ApplyChange::getSignMemberListNo,null)
			.eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}
			}
			return title+"状态已流转，不做处理";
			}

			private String dealZBJJBQYBiz(String path, NotifyDataReq data, String title) {
			//直保加减保企业签署
			ApplyChange applyChange = applyChangeMapper.selectJoinOne(ApplyChange.class,
			new MPJLambdaWrapper<ApplyChange>()
			.selectAll(ApplyChange.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Solutions::getId,ApplyChange::getSolutionsId)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ZERO)
			.eq(ApplyChange::getSignApplyNo,data.getApplyNo()).last("limit 1" ));
			if(applyChange == null){
			return null;
			}
			if( Constants.equalsInteger(applyChange.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
			.set(ApplyChange::getSignApplyNo,null)
			.eq(ApplyChange::getSignApplyNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}
			}

			return title+"状态已流转，不做处理";
			}

			private String dealWTBTBSQBiz(String path, NotifyDataReq data, String title) {
			//委托保投保申请书签署
			InsuranceApply modelTBQSQ = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(InsuranceApply::getApplyTbdNo,data.getApplyNo())
			.last("limit 1" ));
			if(modelTBQSQ == null){
			return null;
			}
			if( Constants.equalsInteger(modelTBQSQ.getUnionApplyTbdStatus(),Constants.ONE)){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadTBSQSSignedFileDo(modelTBQSQ,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getApplyTbdNo,null)
			.eq(InsuranceApply::getApplyTbdNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}
			}
			return title+"状态已流转，不做处理";
			}

			private String dealWTBQYRYMQDBiz(String path, NotifyDataReq data, String title) {
			//委托保企业签署人员名单
			InsuranceApply modelMemberList = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(InsuranceApply::getSignMemberListNo,data.getApplyNo())
			.last("limit 1" ));
			if(modelMemberList == null){
			return null;
			}
			if( Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadApplyMemberListSignedFileDo(modelMemberList,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getSignMemberListNo,null)
			.eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}
			}
			return title+"状态已流转，不做处理";
			}

			private String dealWTBQYQRSBiz(String path, NotifyDataReq data, String title) {
			//委托保企业方案确认书
			InsuranceApply modelTBQRS = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ONE)
			.eq(InsuranceApply::getSignQrsNo,data.getApplyNo())
			.last("limit 1" ));
			if(modelTBQRS == null){
			return null;
			}
			if( Constants.equalsInteger(modelTBQRS.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			//完成签署已完成操作
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title+"合同下载失败，等待下次推送处理";
			}
			uploadFAQRSSignedFileDo(modelTBQRS,fileUrl,path+fileUrl);
			return title+"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getSignQrsNo,null)
			.eq(InsuranceApply::getSignQrsNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}


			}else if(Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
			//如果已拒签，清除合同，下次签章重新生成新合同
			insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getSignApplyNo,null)
			.eq(InsuranceApply::getSignApplyNo,data.getApplyNo()));
			applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
			.set(ApplyChange::getSignApplyNo,null)
			.eq(ApplyChange::getSignApplyNo,data.getApplyNo()));
			insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getSignQrsNo,null)
			.eq(InsuranceApply::getSignQrsNo,data.getApplyNo()));
			insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getSignMemberListNo,null)
			.eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()));
			unionApplyJoinMapper.update(null,new UpdateWrapper<UnionApply>().lambda()
			.set(UnionApply::getSignApplyNo,null)
			.eq(UnionApply::getSignApplyNo,data.getApplyNo()));
			applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
			.set(ApplyChange::getSignMemberListNo,null)
			.eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
			unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
			.set(UnionChange::getSignApplyNo,null)
			.eq(UnionChange::getSignApplyNo,data.getApplyNo()));
			}
			return title+"状态已流转，不做处理";
			}

			/**
			* 投保直保申请签署
			* @param path
			* @param data
			* @return
			*/
			private String dealXBTBBiz(String path, NotifyDataReq data,String title) {
			InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
			new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
			.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
			.selectAs(Company::getName,InsuranceApply::getCompanyName)
			.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
			.eq(Solutions::getType,Constants.ZERO)
			.eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
			.last("limit 1" ));
			if(model == null){
			return null;
			}
			if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
			//完成签署已完成操作
			if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
			String link = signService.linkFile(data.getApplyNo());
			String fileUrl = uploadSignFile(link);
			if(StringUtils.isBlank(fileUrl)){
			//如果下载失败，清除合同，下次签章重新生成新合同
			return title + "合同下载失败，等待下次推送处理";
			}
			uploadSignedFileDo(model,fileUrl,path+fileUrl);
			return title +"状态处理成功";
			}else{
			//如果已拒签，清除合同，下次签章重新生成新合同
			insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getSignApplyNo,null)
			.eq(InsuranceApply::getSignApplyNo,data.getApplyNo()));
			return title+"合同拒签处理成功";
			}

			}
			return title+"状态已流转，不做处理";
			}


			@@ -1407,16 +1648,28 @@
			applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
			if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
			update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
			}else{
			update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
			}
			}
			insuranceApplyMapper.updateById(update);

			//存储待办信息
			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,model.getId()));
			if(Constants.equalsObject(solutions.getType(),Constants.ZERO)) {
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda()
			.eq(Notices::getObjType, noticeObjectType.getKey())
			.ne(Notices::getType, Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId, model.getId()));
			}else{
			//删除全部待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda()
			.eq(Notices::getObjType, noticeObjectType.getKey())
			.eq(Notices::getObjId, model.getId()));
			}


			String info =applyLogType.getInfo();
			if(StringUtils.isNotBlank(update.getCheckInfo())){
			info = info.replace("${param}", update.getCheckInfo());
			@@ -1452,6 +1705,18 @@
			if(!(solutions.getIsdeleted().equals(Constants.ZERO)\|\|solutions.getStatus().equals(Constants.ZERO))){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"方案信息已被禁用");
			}
			if(solutions.getValidType().equals(Constants.ZERO)){
			if(DateUtil.getMontageDate(
			DateUtil.addDaysToDate(new Date(),solutions.getValidTypeNum()),1).getTime()
			>insuranceApply.getApplyStartTime().getTime()){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"保单生效起期错误");
			}
			}else{
			if(DateUtil.getMontageDate(DateUtil.getNextMonthFirst(new Date()),1).getTime()>insuranceApply.getApplyStartTime().getTime()){
			throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"保单生效起期错误");
			}
			}

			List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
			//判断是否存在重复信息
			List<String> idCardList = applyDetailList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList());
			@@ -1475,18 +1740,19 @@
			insuranceApply.setCurrentFee(BigDecimal.ZERO);
			insuranceApply.setCheckUserId(loginUserInfo.getId());
			insuranceApply.setStatus(insuranceApplyStatus.getKey());

			insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
			CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
			countCyclePriceDTO.setSolutionsId(insuranceApply.getSolutionId());
			countCyclePriceDTO.setStartDate(insuranceApply.getStartTime());
			CountCyclePriceVO countCyclePriceVO = this.getCountCyclePriceVO(countCyclePriceDTO);
			insuranceApply.setApplyEndTime(countCyclePriceVO.getEndDate());
			insuranceApply.setEndTime(countCyclePriceVO.getEndDate());
			insuranceApply.setFinalEndTime(countCyclePriceVO.getEndDate());
			insuranceApplyMapper.insert(insuranceApply);


			//处理下级数据
			this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO);
			this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO,true);
			InsuranceApply updBean = new InsuranceApply();
			updBean.setId(insuranceApply.getId());
			updBean.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
			@@ -1497,18 +1763,31 @@
			// info = info.replace("${param}", update.getCheckInfo());
			ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
			applyLogMapper.insert(log);


			//发送待办业务
			//存储待办信息
			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,insuranceApply.getId()));
			Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
			noticesMapper.insert(notices);


			//直保业务发送待办
			if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
			//存储待办信息
			Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,insuranceApply.getId()));
			//存储平台待办
			Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
			noticesMapper.insert(notices);
			CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
			.eq(CompanySolution::getIsdeleted,Constants.ZERO)
			.eq(CompanySolution::getSolutionId,solutions.getId())
			.eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
			.last("limit 1")
			);
			//商户待办
			if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
			Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
			insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
			noticesMapper.insert(shopNotices);
			}
			}
			return insuranceApply.getId();
			}

			@@ -1574,7 +1853,7 @@
			}

			//处理下级数据
			this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO);
			this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO,false);
			insuranceApply.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
			insuranceApplyMapper.updateById(insuranceApply);
			//存储日志数据
			@@ -1600,7 +1879,8 @@



			public void dealApplyDetailData(InsuranceApply insuranceApply,Solutions solutions,List<ApplyDetail> applyDetailList,LoginUserInfo loginUserInfo,CountCyclePriceVO countCyclePriceVO){
			public void dealApplyDetailData(InsuranceApply insuranceApply,Solutions solutions,List<ApplyDetail> applyDetailList,
			LoginUserInfo loginUserInfo,CountCyclePriceVO countCyclePriceVO,Boolean checkNewData){
			//查询保险方案下的所有派遣单位
			List<DuSolution> duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
			.selectAll(DuSolution.class)
			@@ -1609,22 +1889,66 @@
			.eq(DispatchUnit::getIsdeleted,Constants.ZERO)
			.eq(DispatchUnit::getUnitStatus,Constants.ONE)
			.eq(DuSolution::getIsdeleted,Constants.ZERO)
			.eq(checkNewData,DispatchUnit::getDataType,Constants.TWO)
			.eq(DuSolution::getStatus,Constants.ONE)
			.eq(DuSolution::getSolutionId,insuranceApply.getSolutionId()));
			.eq(DuSolution::getSolutionId,insuranceApply.getSolutionId())
			.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(),"数据异常：保险方案下未查询到派遣单位");
			}
			//查询所有派遣单位下的工种
			List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
			List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
			List<DuWorktype> duWorktypeList = duWorkTypeJoinMapper.selectJoinList(DuWorktype.class,new MPJLambdaWrapper<DuWorktype>()
			.selectAll(DuWorktype.class)
			.innerJoin(Worktype.class,Worktype::getId,DuWorktype::getWorkTypeId)
			.eq(DuWorktype::getIsdeleted,Constants.ZERO)
			.eq(DuWorktype::getStatus,Constants.ONE)
			.eq(checkNewData,Worktype::getDataType,Constants.TWO)
			.in(DuWorktype::getDuSolutionId,duSolutionIdList));
			if(!CollectionUtils.isNotEmpty(duWorktypeList)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"数据异常：保险方案下未查询到工种信息");
			}

			if(CollectionUtils.isNotEmpty(applyDetailList)){
			List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
			.eq(Member::getCompanyId,insuranceApply.getCompanyId())
			.eq(Member::getIsdeleted,Constants.ZERO));

			List<Member> addMemberList = new ArrayList<>();
			for (int i = 0; i < applyDetailList.size(); i++) {
			ApplyDetail applyDetail = applyDetailList.get(i);
			Member member = null;
			if(CollectionUtils.isNotEmpty(memberList)){
			Optional<Member> optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
			if(optional.isPresent()){
			member = optional.get();
			}
			}
			if(Objects.isNull(member)){
			member = new Member();
			member.setCreateDate(new Date());
			member.setCreator(loginUserInfo.getId());
			member.setIsdeleted(Constants.ZERO);
			member.setName(applyDetail.getMemberName());
			member.setCompanyId(insuranceApply.getCompanyId());
			member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
			if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"投保员工信息身份证信息错误["+member.getName()+"]");
			}
			member.setIdcardNo(applyDetail.getIdcardNo());
			member.setApplyId(insuranceApply.getId());
			member.setStartTime(applyDetail.getStartTime());
			member.setEndTime(applyDetail.getEndTime());
			member.setDuId(applyDetail.getDuId());
			member.setWorktypeId(applyDetail.getWorktypeId());
			addMemberList.add(member);
			}
			}
			if(CollectionUtils.isNotEmpty(addMemberList)){
			memberJoinMapper.insertBatchSomeColumn(addMemberList);
			}
			memberList.addAll(addMemberList);
			for (int i = 0; i < applyDetailList.size(); i++) {
			ApplyDetail applyDetail = applyDetailList.get(i);
			if(Objects.isNull(applyDetail)
			@@ -1642,31 +1966,16 @@
			applyDetail.setEndTime(insuranceApply.getApplyEndTime());
			applyDetail.setSortnum(i);
			applyDetail.setApplyId(insuranceApply.getId());
			Member member = new Member();
			Member member = null;
			if(Objects.isNull(applyDetail.getMemberId())){
			if(CollectionUtils.isNotEmpty(memberList)){
			Optional<Member> optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
			if(optional.isPresent()){
			member = optional.get();
			}
			}
			//查询是否存在该用户
			member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
			.eq(Member::getCompanyId,insuranceApply.getCompanyId())
			.eq(Member::getIsdeleted,Constants.ZERO)
			.eq(Member::getIdcardNo,applyDetail.getIdcardNo())
			.last(" limit 1")
			);
			if(Objects.isNull(member)){
			member = new Member();
			member.setCreateDate(new Date());
			member.setCreator(loginUserInfo.getId());
			member.setIsdeleted(Constants.ZERO);
			member.setName(applyDetail.getMemberName());
			member.setCompanyId(insuranceApply.getCompanyId());
			member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
			member.setIdcardNo(applyDetail.getIdcardNo());
			member.setApplyId(insuranceApply.getId());
			member.setStartTime(applyDetail.getStartTime());
			member.setEndTime(applyDetail.getEndTime());
			member.setDuId(applyDetail.getDuId());
			member.setWorktypeId(applyDetail.getWorktypeId());
			memberMapper.insert(member);
			}else{
			if(!Objects.isNull(member)){
			member.setApplyId(insuranceApply.getId());
			member.setDuId(applyDetail.getDuId());
			member.setWorktypeId(applyDetail.getWorktypeId());
			@@ -1705,7 +2014,7 @@
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"投保信息异常：总天数与总金额错误");
			}
			applyDetail.setPrice(
			applyDetail.getFee().divide(new BigDecimal(maxDays),2,RoundingMode.HALF_UP)
			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){
			@@ -1777,18 +2086,21 @@
			return new ArrayList<>();
			}
			List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
			if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
			if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DCD.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
			}else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){
			}else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DSP.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
			}else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){
			}else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.BZZ.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
			}else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){
			}else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YTH.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
			}else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){
			}else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGB.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
			}else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){
			}else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DQYQZ.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
			}else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGQ.getKey())){
			statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
			statusList.add(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
			}

			return statusList;
			@@ -1811,9 +2123,10 @@
			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 = 1 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney");
			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 ");
			}
			queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
			@@ -1821,9 +2134,15 @@
			queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
			queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
			queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
			if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
			queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
			queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
			if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
			//如果是已過期
			// queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
			queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
			}else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
			//如果是保障中
			// queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
			queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
			}
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

			@@ -1832,12 +2151,12 @@
			queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
			}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=t.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
			if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType().equals(0)){
			queryWrapper.exists("select cs.id from company_solution cs left join solutions s on cs.solution_id=s.id where cs.isdeleted=0 and s.base_id=t1.base_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=t.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
			queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs left join solutions s on cs.solution_id=s.id where cs.isdeleted=0 and s.base_id=t1.base_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
			"t1.type=1 and t1.shop_id="+loginUserInfo.getCompanyId()+"))") ;
			}
			}else{
			@@ -1847,6 +2166,9 @@
			queryWrapper.eq(InsuranceApply::getCompanyId, -1);
			}
			queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
			}
			if (pageWrap.getModel().getCompanyId() != null) {
			queryWrapper.eq(InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
			}
			if (pageWrap.getModel().getSolutionId() != null) {
			queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
			@@ -1907,7 +2229,8 @@

			public void initApplyStatus(InsuranceApply apply){
			apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
			if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
			if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
			\|\| Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
			//如果已完成
			if(apply.getEndTime()==null \|\| System.currentTimeMillis()>apply.getEndTime().getTime()){
			apply.setStatusCollect(Constants.THREE);//已过期
			@@ -1921,11 +2244,13 @@
			@Override
			public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) {
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

			MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.selectAll(InsuranceApply.class);
			queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
			queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
			queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType);
			queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum");
			queryWrapper.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate");
			queryWrapper.select(" ( 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 ) 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 != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
			@@ -1933,6 +2258,7 @@
			queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
			queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
			queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
			queryWrapper.eq(model.getBaseSolutionId()!=null,Solutions::getBaseId,model.getBaseSolutionId());
			//企业人员查看本企业数据
			if(loginUserInfo.getType().equals(Constants.ONE)){
			queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
			@@ -2000,7 +2326,7 @@
			List<Integer> objList = new ArrayList<>();
			if(list!=null && list.size()>0){
			for(InsuranceApply param : list){
			objList.get(param.getId());
			objList.add(param.getId());
			}
			}else{
			return;
			@@ -2070,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)
			@@ -2121,7 +2448,8 @@
			private void setServiceDays(InsuranceApply insuranceApply) {
			//设置在保时长（天数）
			insuranceApply.setServiceDays(Constants.ZERO);
			if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
			if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
			\|\| insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
			//如果当前时间大于结束日期则使用结束日期对比开始日期
			if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){
			insuranceApply.setServiceDays(
			@@ -2190,7 +2518,9 @@
			MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.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())
			@@ -2207,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);
			@@ -2249,7 +2580,10 @@
			if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
			\|\| insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
			\|\| insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态非可申请退回!");
			}
			if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())){
			@@ -2262,14 +2596,39 @@
			insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS;
			}

			else if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
			\|\| insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
			\|\| insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
			insuranceApplyStatus = Constants.InsuranceApplyStatus.WTB_RETURN;
			}

			//存储待办信息
			//删除其他待办
			noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
			.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
			.eq(Notices::getObjId,insuranceApply.getId()));

			Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
			insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
			noticesMapper.insert(notices);


			CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
			.eq(CompanySolution::getIsdeleted,Constants.ZERO)
			.eq(CompanySolution::getSolutionId,solutions.getId())
			.eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
			.last("limit 1")
			);
			//商户待办
			if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
			Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
			insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.THREE);
			noticesMapper.insert(shopNotices);
			}






			}else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
			@@ -2280,7 +2639,10 @@
			if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
			\|\|insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_RETURN.getKey())
			)
			){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态无法进行关闭!");
			}
			//删除其他待办
			@@ -2315,7 +2677,8 @@
			MPJLambdaWrapper<ApplyDetail> lambdaWrapper = new MPJLambdaWrapper<ApplyDetail>();
			lambdaWrapper.select(ApplyDetail::getId)
			.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
			.and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()).or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
			.and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
			.or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
			.eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
			.apply(" now() between t.START_TIME and t.END_TIME ");

			@@ -2331,38 +2694,38 @@
			*/
			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			public void updateApplyCurrentFee(Integer id){
			public void updateApplyCurrentFee(Integer id,Integer unionId){
			List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.eq(InsuranceApply::getIsdeleted,Constants.ZERO)
			.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
			.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())
			.eq(!Objects.isNull(id),InsuranceApply::getId,id)
			.eq(!Objects.isNull(unionId),InsuranceApply::getUnionApplyId,unionId)
			.le(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
			.ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
			);

			if(CollectionUtils.isNotEmpty(insuranceApplyList)){
			for (InsuranceApply insuranceApply:insuranceApplyList) {
			// Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
			// if(Objects.isNull(solutions)){
			// continue;
			// }
			Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
			if(Objects.isNull(solutions)){
			continue;
			}
			BigDecimal sumAmount = BigDecimal.ZERO;
			List<ApplyDetail> applyDetailList = applyDetailMapper
			.selectList(new QueryWrapper<ApplyDetail>().lambda()
			.eq(ApplyDetail::getApplyId,insuranceApply.getId()));
			if(CollectionUtils.isNotEmpty(applyDetailList)){
			for (ApplyDetail applyDetail: applyDetailList) {
			//2024-1-30 10:04:24 修改根据实际天数进行计算当前费用总金额/总天数*实际天数
			// Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
			BigDecimal fee = applyDetail.getFee();
			BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
			solutions.getPrice():
			solutions.getPrice().add(insuranceApply.getServerCost());
			//在开始结束日期之间
			if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
			Integer days = DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
			applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
			//applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
			applyDetail.setCurrentFee(Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),applyDetail.getStartTime()));
			applyDetailMapper.updateById(applyDetail);
			}else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
			applyDetail.setCurrentFee(fee);
			}else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
			//在结束日期之后
			applyDetail.setCurrentFee(applyDetail.getFee());
			applyDetailMapper.updateById(applyDetail);
			}
			sumAmount = sumAmount.add(applyDetail.getCurrentFee());
			@@ -2372,6 +2735,9 @@
			insuranceApplyMapper.updateById(insuranceApply);
			}
			}
			// if(1==1){
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
			// }
			}


			@@ -2425,13 +2791,13 @@
			public String getSignTBQRSLink(SmsCheckDTO smsCheckDTO) {
			if(Objects.isNull(smsCheckDTO)
			\|\| Objects.isNull(smsCheckDTO.getBusinessId())
			\|\| StringUtils.isBlank(smsCheckDTO.getCode())
			// \|\| StringUtils.isBlank(smsCheckDTO.getCode())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(!debugModel){
			smsEmailService.validateCode(smsCheckDTO.getCode());
			}
			// if(!debugModel){
			// smsEmailService.validateCode(smsCheckDTO.getCode());
			// }
			MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
			@@ -2507,6 +2873,7 @@
			.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
			.isNull(ApplyDetail::getFromId)
			.eq(ApplyDetail::getApplyId,model.getId())
			.orderByAsc(ApplyDetail::getId)
			);
			model.setApplyDetailList(applyDetailList);
			return model;
			@@ -2521,14 +2888,14 @@
			public String getMemberListOnlineSignLink(SmsCheckDTO smsCheckDTO) {
			if(Objects.isNull(smsCheckDTO)
			\|\| Objects.isNull(smsCheckDTO.getBusinessId())
			\|\| StringUtils.isBlank(smsCheckDTO.getCode())
			// \|\| StringUtils.isBlank(smsCheckDTO.getCode())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			//验证验证码
			if(!debugModel){
			smsEmailService.validateCode(smsCheckDTO.getCode());
			}
			// if(!debugModel){
			// smsEmailService.validateCode(smsCheckDTO.getCode());
			// }
			InsuranceApply model = this.queryApplyDetail(smsCheckDTO.getBusinessId());
			if(Objects.isNull(model)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询保单信息");
			@@ -2584,14 +2951,14 @@
			public String getSignWTBTBDLink(SmsCheckDTO smsCheckDTO) {
			if(Objects.isNull(smsCheckDTO)
			\|\| Objects.isNull(smsCheckDTO.getBusinessId())
			\|\| StringUtils.isBlank(smsCheckDTO.getCode())
			// \|\| StringUtils.isBlank(smsCheckDTO.getCode())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			//验证验证码
			if(!debugModel){
			smsEmailService.validateCode(smsCheckDTO.getCode());
			}
			// if(!debugModel){
			// smsEmailService.validateCode(smsCheckDTO.getCode());
			// }
			MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
			.selectAll(InsuranceApply.class)
			.selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
			@@ -2617,7 +2984,7 @@
			Constants.ApplyLogType applyLogType = null;
			String info = "";
			//如果是驳回,只能可驳回已签章状态下的退回申请状态进行操作
			if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
			if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
			}
			Company company = user.getCompany();
			@@ -2629,7 +2996,7 @@
			}
			Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
			.eq(Multifile::getObjId,model.getId())
			.eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey())
			.eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
			.eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1"));
			if(f == null \|\| StringUtils.isBlank(f.getFileurl())){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取确认书文件失败，请联系商户确认投保申请书是否正确！");