From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 06 六月 2025 19:19:34 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 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 0b05aba..dadcb8f 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 @@ -105,7 +105,6 @@ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�") @TableField(exist = false) private Integer feeType; - @ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1") private Integer companyId; @@ -144,10 +143,27 @@ @ApiModelProperty(value = "閫�绉熺粨绠楅噾棰濆悎璁�", example = "1") @ExcelColumn(name="閫�绉熺粨绠楅噾棰濆悎璁�") private BigDecimal btFee; + @ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1") @ExcelColumn(name="瀹㈡埛鍚嶇О",index = 0,width = 10) @TableField(exist = false) private String customerName; + + @ApiModelProperty(value = "瀹㈡埛榛樿鑱旂郴浜�", example = "1") + @TableField(exist = false) + private Integer customerUserId; + + @ApiModelProperty(value = "瀹㈡埛涓婚敭", example = "1") + @TableField(exist = false) + private Integer customerId; + + @ApiModelProperty(value = "鏄惁鍙戦�侀偖浠讹細0=鍚︼紱1=鍙戦�佹垚鍔燂紱2=鍙戦�佸け璐�", example = "1") + @TableField(exist = false) + private Integer isSendEmail; + + @ApiModelProperty(value = "鏄惁鍙戦�佺煭淇★細0=鍚︼紱1=鍙戦�佹垚鍔燂紱2=鍙戦�佸け璐�", example = "1") + @TableField(exist = false) + private Integer isSendSms; @ApiModelProperty(value = "鍏徃鍚嶇О", example = "1") @TableField(exist = false) @@ -162,6 +178,10 @@ @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) @@ -198,6 +218,18 @@ @ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡") private Integer isOverdue; + @ApiModelProperty(value = "鍚堝悓鍗曚环锛堝厓锛�", example = "1") + @TableField(exist = false) + private BigDecimal price; + + @ApiModelProperty(value = "浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱", example = "1") + @TableField(exist = false) + private Integer circleType; + + @ApiModelProperty(value = "鏉℃绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃", example = "1") + @TableField(exist = false) + private Integer detailType; + @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1") @TableField(exist = false) private List<Multifile> multifileList; @@ -210,4 +242,17 @@ @TableField(exist = false) private List<YwContractRevenue> ywContractRevenueList; + @ApiModelProperty(value = "绉熻祦鎬婚潰绉�", example = "1") + @TableField(exist = false) + private BigDecimal totalArea; + + @ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1") + @TableField(exist = false) + private Integer zlPayType; + + @ApiModelProperty(value = "鐗╀笟鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1") + @TableField(exist = false) + private Integer wyPayType; + + } -- Gitblit v1.9.3