productDev/yunyibao.git

			@@ -78,7 +78,7 @@
			@ExcelColumn(name="期望保险生效起期")
			// @DateTimeFormat(pattern = "yyyy-MM-dd")
			// @JsonFormat(pattern="yyyy-MM-dd")
			private Date applyStartTime;
			private Date applyStartTime;

			@ApiModelProperty(value = "实际保险生效止期")
			@ExcelColumn(name="实际保险生效止期")
			@@ -104,6 +104,16 @@
			@ApiModelProperty(value = "最近操作人编码（关联system_user)", example = "1")
			@ExcelColumn(name="最近操作人编码（关联system_user)")
			private Integer checkUserId;
			@ApiModelProperty(value = "合并单编码（关联union_apply)", example = "1")
			@ExcelColumn(name="合并单编码（关联union_apply)")
			private Integer unionApplyId;

			@ApiModelProperty(value = "合并单-投保单状态 0=未上传;1=已上传;2=已签署;3=已上传保险单", example = "1")
			private Integer unionApplyTbdStatus;

			@ApiModelProperty(value = "委托保-投保单合同号（商户上传，企业签署）")
			@ExcelColumn(name="委托保-投保单合同号（商户上传，企业签署）")
			private String applyTbdNo;

			@ApiModelProperty(value = "单号")
			@ExcelColumn(name="单号")
			@@ -112,7 +122,8 @@
			@ExcelColumn(name="在线签章合同号")
			private String signApplyNo;

			@ApiModelProperty(value = "状态 0待审核 1平台退回保单（已退回） 2已上传代签申请表待企业签章（待签署） 3已签章待上传保险单（待出单） 4保单出具失败退回（已退回） 5已上传保单（保障中）6企业申请退回中 7平台同意退回（已退回） 8企业关闭（已关闭）", example = "1")
			@ApiModelProperty(value = "状态 0待审核 1平台退回保单（已退回） 2已上传代签申请表待企业签章（待签署） 3已签章待上传保险单（待出单） 4保单出具失败退回（已退回） 5已上传保单（保障中）6企业申请退回中 7平台同意退回（已退回） 8企业关闭（已关闭）;" +
			" 【委托投保】 0提交投保 12已签署方案确认书 13已签署名单 10审核通过 5保障中", example = "1")
			@ExcelColumn(name="状态 0待审核 1平台退回保单（已退回） 2已上传代签申请表待企业签章（待签署） 3已签章待上传保险单（待出单） 4保单出具失败退回（已退回） 5已上传保单（保障中）6企业申请退回中 7平台同意退回（已退回） 8企业关闭（已关闭）")
			private Integer status;

			@@ -124,6 +135,28 @@
			@ExcelColumn(name="总费用")
			private BigDecimal fee;

			@ApiModelProperty(value = "服务费")
			@ExcelColumn(name="服务费")
			private BigDecimal serverCost;

			@ApiModelProperty(value = "在线确认书合同号")
			@ExcelColumn(name="在线确认书合同号")
			private String signQrsNo;

			@ApiModelProperty(value = "人员名单签署合同号")
			@ExcelColumn(name="人员名单签署合同号")
			private String signMemberListNo;


			@ApiModelProperty(value = "周期结束日期（2022-02-02 23:59:59）")
			@ExcelColumn(name="周期结束日期（2022-02-02 23:59:59）")
			// @DateTimeFormat(pattern = "yyyy-MM-dd")
			// @JsonFormat(pattern="yyyy-MM-dd")
			private Date finalEndTime;

			@ApiModelProperty(value = "复审人主键")
			private Integer retrialId;

			@ApiModelProperty(value = "企业名称")
			@TableField(exist = false)
			private String companyName;
			@@ -131,6 +164,22 @@
			@ApiModelProperty(value = "方案名称")
			@TableField(exist = false)
			private String solutionsName;

			@ApiModelProperty(value = "是否有派遣单位 0有 1无", example = "1")
			@TableField(exist = false)
			private Integer hasDispatchUnit;

			@ApiModelProperty(value = "委托方案签章方式 0企业签署商户上传投保单 1企业签投保申请 2企业无需签章", example = "1")
			@TableField(exist = false)
			private Integer signType;

			@ApiModelProperty(value = "批改提醒时间 HH:mm")
			@TableField(exist = false)
			private String correctWarnTime;

			@ApiModelProperty(value = "方案类型 0直保 1委托投保")
			@TableField(exist = false)
			private Integer solutionType;
			@ApiModelProperty(value = "方案邮件")
			@TableField(exist = false)
			private String solutionEmail;
			@@ -145,6 +194,11 @@
			@ApiModelProperty(value = "投保人数")
			@TableField(exist = false)
			private Integer insureNum;

			@ApiModelProperty(value = "在保人数")
			@TableField(exist = false)
			private Integer guaranteeNum;


			@ApiModelProperty(value = "开票金额")
			@TableField(exist = false)
			@@ -173,6 +227,13 @@
			@TableField(exist = false)
			private Multifile baoxiandanFile;

			@ApiModelProperty(value = "申请单对象")
			@TableField(exist = false)
			private Multifile shenqingdanFile;
			@ApiModelProperty(value = "签署后方案确认书对象")
			@TableField(exist = false)
			private Multifile fanganFile;

			@ApiModelProperty(value = "日志记录")
			@TableField(exist = false)
			private List<ApplyLog> applyLogList;
			@@ -190,7 +251,6 @@
			@TableField(exist = false)
			private Date lastChangeDate;


			@ApiModelProperty(value = "最低年龄", example = "1")
			@TableField(exist = false)
			private Integer minAge;
			@@ -198,7 +258,6 @@
			@ApiModelProperty(value = "最高年龄", example = "1")
			@TableField(exist = false)
			private Integer maxAge;


			@ApiModelProperty(value = "保险费用(人/天）", example = "1")
			@TableField(exist = false)
			@@ -209,9 +268,24 @@
			private Integer timeUnit;


			@ApiModelProperty(value = "批改总金额")
			@TableField(exist = false)
			private BigDecimal changeMoney;

			@ApiModelProperty(value = "方案基础版本主键", example = "1")
			@TableField(exist = false)
			private Integer solutionBaseId;

			@ApiModelProperty(value = "最新版本的方案主键", example = "1")
			@TableField(exist = false)
			private Integer newVersionSolutionId;


			@ApiModelProperty(value = "商户名称")
			@TableField(exist = false)
			private String shopName;



			public TaxesInvoicingVO toTaxesInvoicingVO(){
			TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
			@@ -225,7 +299,4 @@
			return taxesInvoicingVO;
			}

			@ApiModelProperty(value = "在线签章地址")
			@TableField(exist = false)
			private String signLink;
			}