From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期一, 06 一月 2025 09:28:10 +0800 Subject: [PATCH] 1 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java index 4d1a770..1d28bbf 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java @@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; import java.math.BigDecimal; import java.util.List; @@ -51,8 +53,8 @@ private String title; @ApiModelProperty(value = "璐﹀崟缂栧彿") private String code; - @ApiModelProperty(value = "绫诲瀷 0鍚堝悓璐﹀崟 1鑷缓璐﹀崟", example = "1") - @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鑷缓璐﹀崟;") + @ApiModelProperty(value = "绫诲瀷 0鍚堝悓璐﹀崟 1鑷缓璐﹀崟 2閫�娆捐处鍗�", example = "1") + @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鑷缓璐﹀崟;2=閫�娆捐处鍗�") private Integer type; @ApiModelProperty(value = "鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�", example = "1") @@ -60,8 +62,11 @@ @ApiModelProperty(value = "寮�濮嬫椂闂�") @ExcelColumn(name="璁¤垂寮�濮嬫棩鏈�",index = 10,width = 6,dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date startDate; + @ApiModelProperty(value = "缁撴潫鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd") @ExcelColumn(name="璁¤垂缁撴潫鏃ユ湡",index = 11,width = 6,dateFormat = "yyyy-MM-dd") private Date endDate; @@ -70,7 +75,7 @@ private Date actPayDate; @ApiModelProperty(value = "璁″垝浠樻鏃�") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private Date planPayDate; @ApiModelProperty(value = "鍚堝悓鏉℃缂栫爜锛堝叧鑱攜w_contract_detail)", example = "1") @@ -90,8 +95,8 @@ @ExcelColumn(name="搴旀敹閲戦",index = 5,width = 6) private BigDecimal receivableFee; - @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟璇侀噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬 ", example = "1") - @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟璇侀噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;") + @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬; 7=淇濊瘉閲�", example = "1") + @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾;4=姘寸數璐�;5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�;") private Integer costType; @ApiModelProperty(value = "璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻", example = "1") @@ -100,13 +105,13 @@ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�") @TableField(exist = false) private Integer feeType; - @ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1") private Integer companyId; @ApiModelProperty(value = "浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�") @ExcelColumn(name="缁撴竻鐘舵��",index = 3,width = 6,valueMapping = "0=寰呮敹娆�;1=宸茬粨娓�;2=閮ㄥ垎缁撴竻;3=寰呬粯娆�;4=寰呴��娆�;5=宸插叧闂�;") private Integer payStatus; + @ApiModelProperty(value = "閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�", example = "1") @ExcelColumn(name="閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�") private Integer btType; @@ -156,22 +161,24 @@ @ExcelColumn(name="鍚堝悓缂栧彿",index = 2,width = 10) @TableField(exist = false) private String contractCode; + @ApiModelProperty(value = "鍚堝悓鐘舵��", example = "1") + @TableField(exist = false) + private Integer contractStatus; @ApiModelProperty(value = "妤煎畤鎴块棿", example = "1") @ExcelColumn(name="妤煎畤鎴块棿",index = 1,width = 10) @TableField(exist = false) private String roomPathName; - @ApiModelProperty(value = "鎴块棿鏁版嵁", example = "1") - @TableField(exist = false) - private List<YwRoom> ywRoomList ; - - @ApiModelProperty(value = "璁″垝浠樻鏃� - 寮�濮�") @TableField(exist = false) @JsonFormat(pattern = "yyyy-MM-dd") private Date planPayDateStart; + @ApiModelProperty(value = "鍒涘缓浜哄悕绉�") + @ExcelColumn(name="鍒涘缓浜�",index = 9,width = 10) + @TableField(exist = false) + private String realname; @ApiModelProperty(value = "璁″垝浠樻鏃� - 缁撴潫") @TableField(exist = false) @@ -181,7 +188,7 @@ @ApiModelProperty(value = "瀹炴敹閲戦") @TableField(exist = false) @ExcelColumn(name="瀹炴敹閲戦",index = 6,width = 6) - private BigDecimal actReceivableFee; + private BigDecimal actReceivableFee = BigDecimal.ZERO; @ApiModelProperty(value = "闇�鏀堕噾棰�") @TableField(exist = false) @@ -191,7 +198,7 @@ @ApiModelProperty(value = "鏄惁閫炬湡锛�0=鍚︼紱1=鏄�") @TableField(exist = false) @ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡") - private BigDecimal isOverdue; + private Integer isOverdue; @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1") @TableField(exist = false) -- Gitblit v1.9.3