From df59cad917c6db1db3b36a23f4b3e7be510e9ed0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 11:20:37 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 412f5c3..4bce582 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -108,6 +108,13 @@
@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="鍗曞彿")
private String code;
@@ -115,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;
@@ -126,6 +134,26 @@
@ApiModelProperty(value = "鎬昏垂鐢�")
@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 = "浼佷笟鍚嶇О")
@TableField(exist = false)
@@ -179,6 +207,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;
@@ -196,7 +231,6 @@
@TableField(exist = false)
private Date lastChangeDate;
-
@ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
@TableField(exist = false)
private Integer minAge;
@@ -204,7 +238,6 @@
@ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
@TableField(exist = false)
private Integer maxAge;
-
@ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
@TableField(exist = false)
@@ -214,11 +247,21 @@
@TableField(exist = false)
private Integer timeUnit;
+ @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();
taxesInvoicingVO.setId(this.getId());
--
Gitblit v1.9.3