From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 19 五月 2025 09:45:07 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 102 insertions(+), 9 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 677bffd..da6a49b 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 @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -10,17 +11,17 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 鐞嗚禂鐢宠琛� * @author 姹熻箘韫� - * @date 2024/01/15 11:15 + * @date 2024/01/16 10:03 */ @Data @ApiModel("鐞嗚禂鐢宠琛�") @TableName("`settle_claims`") public class SettleClaims { - @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @ExcelColumn(name="涓婚敭") @@ -32,7 +33,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -41,7 +42,7 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -72,10 +73,9 @@ @ExcelColumn(name="浜嬫晠鍙戠敓鏃堕棿") private String happenTime; - @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�") - @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date idcardNo; + @ApiModelProperty(value = "璇佷欢鍙�") + @ExcelColumn(name="璇佷欢鍙�") + private String idcardNo; @ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1") @ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)") @@ -88,7 +88,10 @@ @ApiModelProperty(value = "璐圭敤", example = "1") @ExcelColumn(name="璐圭敤") private BigDecimal fee; + @ApiModelProperty(value = "瀹℃牳鏃堕棿") + @ExcelColumn(name="瀹℃牳鏃堕棿") + private Date checkDate; @ApiModelProperty(value = "鏈�杩戞搷浣滃娉�") @ExcelColumn(name="鏈�杩戞搷浣滃娉�") private String checkInfo; @@ -124,14 +127,32 @@ @ApiModelProperty(value = "鎶ユ浜哄鍚�") @ExcelColumn(name="鎶ユ浜哄鍚�") 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 Integer areaId; + private String areaId; @ApiModelProperty(value = "鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級") @ExcelColumn(name="鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級") @@ -145,4 +166,76 @@ @ExcelColumn(name="鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply_") private Integer insuranceApplyId; + + @ApiModelProperty(value = "淇濋櫓鍗曢檮浠�") + @TableField(exist = false) + private Multifile baoxiandanFile; + @ApiModelProperty(value = "鎶ユ瑙嗛") + @TableField(exist = false) + private List<Multifile> reportFileList; + + @ApiModelProperty(value = "鍛樺伐鍏崇郴璧勬枡") + @TableField(exist = false) + private List<Multifile> relationFileList; + + @ApiModelProperty(value = "闂ㄨ瘖璧勬枡") + @TableField(exist = false) + private List<Multifile> outpatientFileList; + + @ApiModelProperty(value = "浣忛櫌璧勬枡") + @TableField(exist = false) + private List<Multifile> hospitalFileList; + + @ApiModelProperty(value = "浼ゆ畫璧勬枡") + @TableField(exist = false) + private List<Multifile> disabilityFileList; + + @ApiModelProperty(value = "璧斾粯缁撴璧勬枡") + @TableField(exist = false) + private List<Multifile> compensationFileList; + + @ApiModelProperty(value = "鏃ュ織鍒楄〃") + @TableField(exist = false) + List<SettleClaimsLog> settleClaimsLogList; + + @ApiModelProperty(value = "鍑洪櫓浜�") + @TableField(exist = false) + private String memberName; + @ApiModelProperty(value = "鍑洪櫓浜鸿韩浠借瘉") + @TableField(exist = false) + private String memberIdcardNo; + @ApiModelProperty(value = "浼佷笟鍚嶇О") + @TableField(exist = false) + private String companyName; + @ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О") + @TableField(exist = false) + private String solutionName; + @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О") + @TableField(exist = false) + private String duName; + @ApiModelProperty(value = "宸ョ鍚嶇О") + @TableField(exist = false) + private String worktypeName; + @ApiModelProperty(value = "淇濆崟鍙�") + @TableField(exist = false) + private String applyCode; + @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡") + @TableField(exist = false) + private Date baoxianStartTime; + @ApiModelProperty(value = "淇濋櫓鐢熸晥姝㈡湡") + @TableField(exist = false) + private Date baoxianEndTime; + + @ApiModelProperty(value = "璧勬枡瀹屾垚鏃堕棿") + @TableField(exist = false) + private Date finishDate; + + + @ApiModelProperty(value = "鏂规鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1") + @TableField(exist = false) + private Integer baseSolutionId; + @ApiModelProperty(value = "娲鹃仯鍗曚綅鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1") + @TableField(exist = false) + private Integer baseDuId; + } -- Gitblit v1.9.3