From 418eb69319481f176a49ab085b971d81d55661f7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 10:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index 7720870..c0c8607 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -106,8 +106,8 @@
@ExcelColumn(name="鍗曞彿")
private String code;
- @ApiModelProperty(value = "鐘舵�� 寮冪敤(0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級2鍙楃悊涓� 3纭璧勬枡锛堝鐞嗕腑锛� 4瀹屾垚鍙楃悊锛堝凡缁撴锛�) 5寰呭彈鐞� 6鍙楃悊閫�鍥� 7寰呭晢璁� 8鍟嗚寰呭鎵� 9鍟嗚瀹℃壒鎷掔粷 10宸插彈鐞�", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級 2纭璧勬枡锛堝鐞嗕腑锛� 3瀹屾垚鍙楃悊锛堝凡缁撴锛�")
+ @ApiModelProperty(value = "鐘舵�� 0鏆傚瓨涓� 1宸叉姤妗� 2寰呯珛妗� 3宸茬珛妗� 4绔嬫閫�鍥� 5寰呭彈鐞� 6鎷掔粷鍙楃悊 7鍟嗚寰呭鎵� 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12寰呯粨妗� 13宸茬粨妗� 14宸叉挙妗�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0鏆傚瓨涓� 1宸叉姤妗� 2寰呯珛妗� 3宸茬珛妗� 4绔嬫閫�鍥� 5寰呭彈鐞� 6鎷掔粷鍙楃悊 7鍟嗚寰呭鎵� 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12寰呯粨妗� 13宸茬粨妗� 14宸叉挙妗�")
private Integer status;
@ApiModelProperty(value = "浜嬫晠绫诲瀷 0宸ヤ綔鏈熼棿鍙椾激 1涓婁笅鐝�斾腑鍙椾激 2闈炲伐浣滄椂闂村彈浼� 3鎰忓鍙椾激", example = "1")
@@ -177,37 +177,37 @@
private String shouliType;
@ApiModelProperty(value = "鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬 ")
@ExcelColumn(name="鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬")
- private Integer origin;
+ private String origin;
@ApiModelProperty(value = "鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
@ExcelColumn(name="鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String syProblemOpts;
@ApiModelProperty(value = "鏄惁椋庨櫓妗堜欢 0鍚� 1鏄�")
@ExcelColumn(name="鏄惁椋庨櫓妗堜欢 0鍚� 1鏄�")
- private String isRisk;
+ private Integer isRisk;
@ApiModelProperty(value = "鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
@ExcelColumn(name="鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
- private String riskTimesCx;
+ private Integer riskTimesCx;
@ApiModelProperty(value = "鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
@ExcelColumn(name="鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
- private String riskRepeat;
+ private Integer riskRepeat;
@ApiModelProperty(value = "鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
@ExcelColumn(name="鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
- private String riskTimesSp;
+ private Integer riskTimesSp;
@ApiModelProperty(value = "鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
@ExcelColumn(name="鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
- private String riskNewUser ;
+ private Integer riskNewUser ;
@ApiModelProperty(value = "璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@ExcelColumn(name="璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
private String riskSensitive;
@ApiModelProperty(value = "鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
@ExcelColumn(name="鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
- private String reportNumStatus;
+ private Integer reportNumStatus;
@ApiModelProperty(value = "鎵�鏈夎禂浠橀」淇℃伅锛坖son鏁扮粍[{name:鈥滀紮椋熻垂鈥�,val:100,info:鈥滀紮椋熻垂璇存槑鈥�,type:0}]锛�,type:0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤\t")
@ExcelColumn(name="鎵�鏈夎禂浠橀」淇℃伅")
private String accountContent;
@ApiModelProperty(value = "鍏朵粬璧斾粯椤规�婚")
@ExcelColumn(name="鍏朵粬璧斾粯椤规�婚")
- private String otherAccount;
+ private BigDecimal otherAccount;
@ApiModelProperty(value = "鏄惁鍙禂浠樺尰淇濆鐢ㄨ嵂")
@ExcelColumn(name="鏄惁鍙禂浠樺尰淇濆鐢ㄨ嵂")
private String payForYbwyy;
@@ -227,10 +227,19 @@
@ExcelColumn(name="鏀舵璐︽埛")
private String receiveAccount;
+ @ApiModelProperty(value = "椋庨櫓淇℃伅闆嗗悎")
+ private String riskContent;
+ @ApiModelProperty(value = "鏄惁寰呰ˉ鍏呮潗鏂�:0=鍚︼紱1=鏄�")
+ private Integer waitSupplement;
+ @ApiModelProperty(value = "璐圭敤鏄惁鍙戠敓鍙樻洿:0=鍚︼紱1=鏄紱")
+ private Integer feeUpdate;
+
+ @ApiModelProperty(value = "妗堜欢绫诲瀷锛�0=鏈缃紱1=鍖荤枟锛�2=浼ゆ畫锛�3=姝讳骸")
+ private Integer caseType;
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
@@ -259,6 +268,12 @@
@TableField(exist = false)
private List<Multifile> compensationFileList;
+
+ @ApiModelProperty(value = "鍏朵粬璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> otherFileList;
+
+
@ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
List<SettleClaimsLog> settleClaimsLogList;
--
Gitblit v1.9.3