productDev/yunyibao.git

			@@ -2,7 +2,6 @@

			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;
			@@ -2482,6 +2481,7 @@
			member.setDuId(applyDetail.getDuId());
			member.setWorktypeId(applyDetail.getWorktypeId());
			memberMapper.updateById(member);
			applyDetail.setMemberName(member.getName());
			}
			}else{
			member = memberMapper.selectById(applyDetail.getMemberId());
			@@ -2492,6 +2492,7 @@
			member.setDuId(applyDetail.getDuId());
			member.setWorktypeId(applyDetail.getWorktypeId());
			memberMapper.updateById(member);
			applyDetail.setMemberName(member.getName());
			}
			applyDetail.setMemberId(member.getId());
			applyDetail.setIdcardNo(member.getIdcardNo());
			@@ -2528,7 +2529,6 @@

			/**
			* 查询会员信息在方案下是否存在冲突数据
			* @param solutionId
			* @param startTime
			* @param endTime
			*/
			@@ -3573,7 +3573,7 @@
			if(solutions.getType().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，非委托保方案保单，无法进行该操作!");
			}
			String fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241120/1c80f0d7-ab35-4355-b9fe-944464643115.pdf";//ExcelExporter.build(InsuranceApply.class).exportApplyExcelToPdf(model,"人员名单");
			String fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";//ExcelExporter.build(InsuranceApply.class).exportApplyExcelToPdf(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);