From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 154 ++++++++++++++++++++++++++++++---------------------
1 files changed, 90 insertions(+), 64 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 422bce9..72f77bd 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,7 +2,9 @@
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 com.doumee.dao.business.vo.SettleParentStatusVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -25,206 +27,164 @@
public class SettleClaims {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
- @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
private Integer solutionId;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
- @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
private Integer companyId;
@ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎emeber锛�", example = "1")
- @ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎emeber锛�")
private Integer memberId;
+ @ApiModelProperty(value = "浜哄憳骞撮緞", example = "1")
+ private Integer memberAge;
+
@ApiModelProperty(value = "浜嬫晠鍙戠敓鏃堕棿")
- @ExcelColumn(name="浜嬫晠鍙戠敓鏃堕棿")
private String happenTime;
@ApiModelProperty(value = "璇佷欢鍙�")
- @ExcelColumn(name="璇佷欢鍙�")
private String idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
- @ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
private Integer duId;
@ApiModelProperty(value = "宸ョ缂栫爜(鍏宠仈worktype)", example = "1")
- @ExcelColumn(name="宸ョ缂栫爜(鍏宠仈worktype)")
private Integer worktypeId;
@ApiModelProperty(value = "璐圭敤", example = "1")
- @ExcelColumn(name="璐圭敤")
private BigDecimal fee;
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
- @ExcelColumn(name="瀹℃牳鏃堕棿")
-
private Date checkDate;
+
@ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
- @ExcelColumn(name="鏈�杩戞搷浣滃娉�")
private String checkInfo;
@ApiModelProperty(value = "鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)", example = "1")
- @ExcelColumn(name="鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)")
private Integer checkUserId;
@ApiModelProperty(value = "鍗曞彿")
- @ExcelColumn(name="鍗曞彿")
+ @ExcelColumn(name="鎶ユ鍙�",index = 1,width = 20)
private String code;
@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")
- @ExcelColumn(name="浜嬫晠绫诲瀷 0宸ヤ綔鏈熼棿鍙椾激 1涓婁笅鐝�斾腑鍙椾激 2闈炲伐浣滄椂闂村彈浼� 3鎰忓鍙椾激")
private Integer type;
@ApiModelProperty(value = "灏辫瘖绫诲瀷:0浣忛櫌 1闂ㄨ瘖", example = "1")
- @ExcelColumn(name="灏辫瘖绫诲瀷:0浣忛櫌 1闂ㄨ瘖")
private Integer inHospital;
+
@ApiModelProperty(value = "鏄惁鏈夊尰鐤椾繚闄� 0鏄� 1鍚�", example = "1")
- @ExcelColumn(name="鏄惁鏈夊尰鐤椾繚闄� 0鏄� 1鍚�")
private Integer medicalInsurance;
@ApiModelProperty(value = "浜嬫晠鎻忚堪")
- @ExcelColumn(name="浜嬫晠鎻忚堪")
private String content;
@ApiModelProperty(value = "鎶ユ浜哄鍚�")
- @ExcelColumn(name="鎶ユ浜哄鍚�")
+ @ExcelColumn(name="鎶ユ浜�",index = 3,width = 20)
private String informantName;
+
@ApiModelProperty(value = "鍖荤枟鐞嗚禂")
- @ExcelColumn(name="鍖荤枟鐞嗚禂")
private BigDecimal ylClaimAccount;
@ApiModelProperty(value = "璇伐鐞嗚禂")
- @ExcelColumn(name="璇伐鐞嗚禂")
private BigDecimal wgClaimAccount;
@ApiModelProperty(value = "姝讳骸鐞嗚禂")
- @ExcelColumn(name="姝讳骸鐞嗚禂")
private BigDecimal swClaimAccount;
@ApiModelProperty(value = "浼ゆ畫鐞嗚禂")
- @ExcelColumn(name="浼ゆ畫鐞嗚禂")
private BigDecimal scClaimAccount;
@ApiModelProperty(value = "鐞嗚禂鎬婚")
- @ExcelColumn(name="鐞嗚禂鎬婚")
private BigDecimal claimAccount;
@ApiModelProperty(value = "鎶ユ浜鸿仈绯绘柟寮�")
- @ExcelColumn(name="鎶ユ浜鸿仈绯绘柟寮�")
private String informantPhone;
@ApiModelProperty(value = "灏辫瘖鍖荤枟鏈烘瀯")
- @ExcelColumn(name="灏辫瘖鍖荤枟鏈烘瀯")
private String hospital;
@ApiModelProperty(value = "鍑洪櫓鍦板尯(鍏宠仈areas)", example = "1")
- @ExcelColumn(name="鍑洪櫓鍦板尯(鍏宠仈areas)")
private String areaId;
@ApiModelProperty(value = "鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
- @ExcelColumn(name="鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
private String areaInfo;
@ApiModelProperty(value = "鎶ユ鍙�")
- @ExcelColumn(name="鎶ユ鍙�")
+ @ExcelColumn(name="淇濆徃鎶ユ鍙�",index = 2,width = 20)
private String reportNum;
@ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply_", example = "1")
- @ExcelColumn(name="鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply_")
private Integer insuranceApplyId;
@ApiModelProperty(value = "鏄惁浼ゆ畫锛� 0鏄� 1鍚� 2寰呯‘瀹�")
- @ExcelColumn(name="鏄惁浼ゆ畫锛� 0鏄� 1鍚� 2寰呯‘瀹�")
- private String hurtType;
+ private Integer hurtType;
@ApiModelProperty(value = "鍙楃悊绫诲瀷锛�0鐩存帴鍙楃悊 1鍟嗚鍙楃悊")
- @ExcelColumn(name="鍙楃悊绫诲瀷锛�0鐩存帴鍙楃悊 1鍟嗚鍙楃悊")
- private String shouliType;
+ private Integer shouliType;
@ApiModelProperty(value = "鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬 ")
- @ExcelColumn(name="鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬")
private Integer 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 Integer isRisk;
@ApiModelProperty(value = "鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
- @ExcelColumn(name="鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
private Integer riskTimesCx;
@ApiModelProperty(value = "鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
- @ExcelColumn(name="鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
private Integer riskRepeat;
@ApiModelProperty(value = "鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
- @ExcelColumn(name="鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
private Integer riskTimesSp;
@ApiModelProperty(value = "鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
- @ExcelColumn(name="鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
private Integer riskNewUser ;
@ApiModelProperty(value = "璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- @ExcelColumn(name="璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
private String riskSensitive;
+
+ @ApiModelProperty(value = "寤惰繜鎶ユ椋庨櫓 0鍚�1鏄�")
+ private Integer riskDelayUnit ;
+
+ @ApiModelProperty(value = "淇濆崟鏈敓鏁堥闄� 0鍚�1鏄�")
+ private Integer riskUnTakeEffect ;
+
@ApiModelProperty(value = "鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
- @ExcelColumn(name="鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
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 BigDecimal otherAccount;
@ApiModelProperty(value = "鏄惁鍙禂浠樺尰淇濆鐢ㄨ嵂")
- @ExcelColumn(name="鏄惁鍙禂浠樺尰淇濆鐢ㄨ嵂")
- private String payForYbwyy;
+ private Integer payForYbwyy;
@ApiModelProperty(value = "鏁翠綋鐘舵�� 0鏈彁浜� 1寰呯珛妗� 2寰呭彈鐞� 3")
- @ExcelColumn(name="鏁翠綋鐘舵��")
private String allStatus;
@ApiModelProperty(value = "鏀舵閾惰")
- @ExcelColumn(name="鏀舵閾惰")
private String receiveBank;
@ApiModelProperty(value = "鏀舵浜�")
- @ExcelColumn(name="鏀舵浜�")
private String receiveUserName;
@ApiModelProperty(value = "鏀舵璐︽埛")
- @ExcelColumn(name="鏀舵璐︽埛")
private String receiveAccount;
@ApiModelProperty(value = "椋庨櫓淇℃伅闆嗗悎")
@@ -233,6 +193,9 @@
@ApiModelProperty(value = "鏄惁寰呰ˉ鍏呮潗鏂�:0=鍚︼紱1=鏄�")
private Integer waitSupplement;
+
+ @ApiModelProperty(value = "琛ュ厖鏉愭枡璇存槑")
+ private String waitSupplementInfo;
@ApiModelProperty(value = "璐圭敤鏄惁鍙戠敓鍙樻洿:0=鍚︼紱1=鏄紱")
@@ -243,12 +206,34 @@
@ApiModelProperty(value = "鏍歌禂鎵�鏈夎禂浠橀」淇℃伅锛坖son鏁扮粍[{name:鈥滀紮椋熻垂鈥�,val:100,info:鈥滀紮椋熻垂璇存槑鈥�,type:0}]锛�,type:0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤\t")
- @ExcelColumn(name="鏍歌禂鎵�鏈夎禂浠橀」淇℃伅")
private String hpAccountContent;
- @ApiModelProperty(value = "鏍歌禂鎬婚噾棰�")
+ @ApiModelProperty(value = "鏍歌禂涓昏閲戦")
private BigDecimal hpAccount;
+ @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦")
+ private BigDecimal hpOtherAccount;
+
+ @ApiModelProperty(value = "璇︾粏鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屼富閿�")
+ private Integer applyDetailId;
+
+ @ApiModelProperty(value = "鎶ユ鏃堕棿")
+ @TableField(exist = false)
+ private Date reportDate;
+
+
+ @ApiModelProperty(value = "璧斿伩閲戦")
+ @TableField(exist = false)
+ @ExcelColumn(name="璧斿伩閲戦",index = 10,width = 16)
+ private BigDecimal pcAccount;
+
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
+ @TableField(exist = false)
+ @ExcelColumn(name="妗堜欢鐘舵��",index = 11,width = 16)
+ private String statusName;
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
@@ -272,6 +257,9 @@
@ApiModelProperty(value = "浼ゆ畫璧勬枡")
@TableField(exist = false)
private List<Multifile> disabilityFileList;
+ @ApiModelProperty(value = "鐢靛瓙淇濆崟")
+ @TableField(exist = false)
+ private List<Multifile> dzbdFileList;
@ApiModelProperty(value = "璧斾粯缁撴璧勬枡")
@TableField(exist = false)
@@ -282,6 +270,16 @@
@TableField(exist = false)
private List<Multifile> otherFileList;
+ @ApiModelProperty(value = "琛ュ厖璇存槑鏂囦欢")
+ @TableField(exist = false)
+ private List<Multifile> supplementFileList;
+
+
+ @ApiModelProperty(value = "鎵撴鍑瘉")
+ @TableField(exist = false)
+ private List<Multifile> payFileList;
+
+
@ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
@@ -289,24 +287,30 @@
@ApiModelProperty(value = "鍑洪櫓浜�")
@TableField(exist = false)
+ @ExcelColumn(name="鍑洪櫓浜�",index = 4,width = 16)
private String memberName;
@ApiModelProperty(value = "鍑洪櫓浜鸿韩浠借瘉")
+ @ExcelColumn(name="韬唤璇佸彿",index = 5,width = 16)
@TableField(exist = false)
private String memberIdcardNo;
@ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @ExcelColumn(name="鎶曚繚鍗曚綅",index = 6,width = 16)
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
@TableField(exist = false)
+ @ExcelColumn(name="淇濋櫓鏂规",index = 8,width = 16)
private String solutionName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
@TableField(exist = false)
+ @ExcelColumn(name="鐢ㄤ汉鍗曚綅",index = 7,width = 16)
private String duName;
@ApiModelProperty(value = "宸ョ鍚嶇О")
@TableField(exist = false)
private String worktypeName;
@ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
+ @ExcelColumn(name="淇濆崟鍙�",index = 9,width = 16)
private String applyCode;
@ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
@TableField(exist = false)
@@ -331,6 +335,28 @@
private SettleClaimsExt extData;
@ApiModelProperty(value = "璐圭敤瀵硅薄闆嗗悎", example = "1")
@TableField(exist = false)
- private List<SettleClaimsMoneyVO> accountList;
+ private List<CompensationVO> accountList;
+
+ @ApiModelProperty(value = "娴佺▼璇︽儏淇℃伅", example = "1")
+ @TableField(exist = false)
+ private List<SettleParentStatusVO> parentStatusVOList;
+
+ @ApiModelProperty(value = "鎶ユ鏃堕棿 鏌ヨ浣跨敤 yyyy-MM-dd")
+ @TableField(exist = false)
+ private String createDateStr;
+
+ @ApiModelProperty(value = "娴佺▼鑰楁椂",hidden = true)
+ @TableField(exist = false)
+ private Integer totalHours;
+
+
+ @ApiModelProperty(value = "鎷掔粷閫�鍥炴棩蹇�")
+ @TableField(exist = false)
+ private SettleClaimsLog refuseSettleClaimsLog;
+
+ @ApiModelProperty(value = "琛ュ厖璇存槑鏃ュ織")
+ @TableField(exist = false)
+ private SettleClaimsLog supplementSettleClaimsLog;
+
}
--
Gitblit v1.9.3