From 845f406d11563c12b9e35562ce587a72cd47cb9d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 17:48:43 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 c0c8607..3cce6d7 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.SettleClaimsMoneyVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -177,7 +178,7 @@
private String shouliType;
@ApiModelProperty(value = "鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬 ")
@ExcelColumn(name="鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬")
- private String origin;
+ private Integer origin;
@ApiModelProperty(value = "鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
@ExcelColumn(name="鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String syProblemOpts;
@@ -241,6 +242,18 @@
@ApiModelProperty(value = "妗堜欢绫诲瀷锛�0=鏈缃紱1=鍖荤枟锛�2=浼ゆ畫锛�3=姝讳骸")
private Integer caseType;
+
+ @ApiModelProperty(value = "鏍歌禂鎵�鏈夎禂浠橀」淇℃伅锛坖son鏁扮粍[{name:鈥滀紮椋熻垂鈥�,val:100,info:鈥滀紮椋熻垂璇存槑鈥�,type:0}]锛�,type:0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤\t")
+ @ExcelColumn(name="鏍歌禂鎵�鏈夎禂浠橀」淇℃伅")
+ private String hpAccountContent;
+
+ @ApiModelProperty(value = "鏍歌禂涓昏閲戦")
+ private BigDecimal hpAccount;
+
+ @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦")
+ private BigDecimal hpOtherAccount;
+
+
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
private Multifile baoxiandanFile;
@@ -273,6 +286,9 @@
@TableField(exist = false)
private List<Multifile> otherFileList;
+ @ApiModelProperty(value = "鎵撴鍑瘉")
+ @TableField(exist = false)
+ private List<Multifile> payFileList;
@ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
@@ -322,6 +338,6 @@
private SettleClaimsExt extData;
@ApiModelProperty(value = "璐圭敤瀵硅薄闆嗗悎", example = "1")
@TableField(exist = false)
- private List<SettleClaimsMoneyVO> accountList;
+ private List<CompensationVO> accountList;
}
--
Gitblit v1.9.3