productDev/yunyibao.git

			@@ -89,16 +89,17 @@
			@ApiModelProperty(value = "状态 0待签署 1已签章 2已上传批单 3退回申请 (待签署) 4退回申请 (已签章) 5平台同意（已退回） 6已关闭 ")
			@ExcelColumn(name="状态 0待签署 1已签章 2已上传批单 3退回申请 (待签署) 4退回申请 (已签章) 5平台同意（已退回） 6已关闭 ")
			private Integer status;

			@ApiModelProperty(value = "合并单编码（关联union_change)", example = "1")
			@ExcelColumn(name="合并单编码（关联union_change)")
			private Integer unionChangeId;
			@ApiModelProperty(value = "在线签章合同号")
			private String signApplyNo;
			@ApiModelProperty(value = "期望保险生效起期")
			@ExcelColumn(name="期望保险生效起期")
			//入参
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			//出参
			@JsonFormat(pattern="yyyy-MM-dd")
			private Date validTime;
			@ApiModelProperty(value = "实际减保生效起期")
			@ExcelColumn(name="实际减保生效起期")
			private Date delValidTime;

			@ApiModelProperty(value = "批单号")
			@ExcelColumn(name="批单号")
			@@ -111,6 +112,14 @@
			@ApiModelProperty(value = "变更金额")
			@ExcelColumn(name="变更金额")
			private BigDecimal fee;

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

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

			@ApiModelProperty(value = "保单号")
			@TableField(exist = false)
			private String applyCode;
			@@ -141,6 +150,10 @@
			@TableField(exist = false)
			private Integer changeNum;

			@ApiModelProperty(value = "最后一次加减保/换厂日期")
			@TableField(exist = false)
			private Date lastChangeDate;

			@ApiModelProperty(value = "提交日期开始 yyyy-MM-dd ")
			@TableField(exist = false)
			private String createDateS;
			@@ -149,13 +162,33 @@
			@TableField(exist = false)
			private String createDateE;

			@ApiModelProperty(value = "批单生效起期时间")
			@TableField(exist = false)
			private String applyStartS;

			@ApiModelProperty(value = "批单止效时间")
			@TableField(exist = false)
			private String applyStartE;

			@ApiModelProperty(value = "保险方案主键")
			@TableField(exist = false)
			private Integer solutionsId;

			@ApiModelProperty(value = "基表保险方案主键")
			@ApiModelProperty(value = "保险方案主键(基表）")
			@TableField(exist = false)
			private Integer baseSolutionsId;
			@ApiModelProperty(value = "申请单附件")
			@TableField(exist = false)
			private Multifile applyFile;
			@ApiModelProperty(value = "申请单换厂附件")
			@TableField(exist = false)
			private Multifile applyUnitFile;
			@ApiModelProperty(value = "批单附件")
			@TableField(exist = false)
			private Multifile pidanFile;

			@ApiModelProperty(value = "批减是否仅支持替换 0否 1是", example = "1")
			@TableField(exist = false)
			private Integer delOnlyReplace;

			@ApiModelProperty(value = "加保明细数据")
			@TableField(exist = false)
			@@ -174,9 +207,6 @@
			@TableField(exist = false)
			private Integer companyId;

			@ApiModelProperty(value = "批单附件对象")
			@TableField(exist = false)
			private Multifile pidanFile;
			@ApiModelProperty(value = "处理企业申请状态 0同意 1驳回")
			@TableField(exist = false)
			private int dealBackApply;
			@@ -187,12 +217,28 @@
			@ApiModelProperty(value = "保险生效止期")
			@TableField(exist = false)
			private Date endTime;

			@ApiModelProperty(value = "方案邮件")
			@TableField(exist = false)
			private String solutionEmail;
			@ApiModelProperty(value = "日志记录")
			@TableField(exist = false)
			private List<ApplyLog> applyLogList;
			@ApiModelProperty(value = "方案类型 0直保 1委托投保")
			@TableField(exist = false)
			private Integer solutionType;


			@ApiModelProperty(value = "合并单主键（保单）")
			@TableField(exist = false)
			private Integer unionApplyId;
			@ApiModelProperty(value = "年份")
			@TableField(exist = false)
			private Integer year;
			@ApiModelProperty(value = "统计条目数")
			@TableField(exist = false)
			private Integer countNum;
			@ApiModelProperty(value = "提交日期开始 yyyy-MM ")
			@TableField(exist = false)
			private String month;

			public TaxesInvoicingVO toTaxesInvoicingVO(){
			TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
			@@ -205,5 +251,7 @@
			taxesInvoicingVO.setType(Constants.ONE);
			return taxesInvoicingVO;
			}

			@ApiModelProperty(value = "是否获取附件信息 0不需要 1需要")
			@TableField(exist = false)
			private Integer getFiles;
			}