From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 145 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 102 insertions(+), 43 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 464dca7..0dcd404 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
@@ -28,118 +28,177 @@
@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 = "璐﹀崟鍚嶇О")
- @ExcelColumn(name="璐﹀崟鍚嶇О")
private String title;
- @ApiModelProperty(value = "绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃ 2绉熻祦鎶奸噾 3鐗╀笟鎶奸噾", example = "1")
- @ExcelColumn(name="绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃ 2绉熻祦鎶奸噾 3鐗╀笟鎶奸噾")
+ @ApiModelProperty(value = "璐﹀崟缂栧彿")
+ private String code;
+ @ApiModelProperty(value = "绫诲瀷 0鍚堝悓璐﹀崟 1鑷缓璐﹀崟", example = "1")
+ @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鑷缓璐﹀崟;")
private Integer type;
+
@ApiModelProperty(value = "鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�", example = "1")
- @ExcelColumn(name="鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�")
private Integer status;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- @ExcelColumn(name="寮�濮嬫椂闂�")
+ @ExcelColumn(name="璁¤垂寮�濮嬫棩鏈�",index = 10,width = 6,dateFormat = "yyyy-MM-dd")
private Date startDate;
-
- @ApiModelProperty(value = "瀹為檯浠樻鏃�")
- @ExcelColumn(name="瀹為檯浠樻鏃�")
- private Date actPayDate;
- @ApiModelProperty(value = "璁″垝浠樻鏃�")
- @ExcelColumn(name="璁″垝浠樻鏃�")
- private Date planPayDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- @ExcelColumn(name="缁撴潫鏃堕棿")
+ @ExcelColumn(name="璁¤垂缁撴潫鏃ユ湡",index = 11,width = 6,dateFormat = "yyyy-MM-dd")
private Date endDate;
+ @ApiModelProperty(value = "瀹為檯浠樻鏃�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actPayDate;
@ApiModelProperty(value = "璁″垝浠樻鏃�")
- @ExcelColumn(name="璁″垝浠樻鏃�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date planPayData;
-
- @ApiModelProperty(value = "瀹為檯浠樻鏃�")
- @ExcelColumn(name="瀹為檯浠樻鏃�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date actPayData;
+ private Date planPayDate;
@ApiModelProperty(value = "鍚堝悓鏉℃缂栫爜锛堝叧鑱攜w_contract_detail)", example = "1")
- @ExcelColumn(name="鍚堝悓鏉℃缂栫爜锛堝叧鑱攜w_contract_detail)")
private Integer detailId;
@ApiModelProperty(value = "鍚堝悓缂栫爜锛堝叧鑱攜w_contract)", example = "1")
- @ExcelColumn(name="鍚堝悓缂栫爜锛堝叧鑱攜w_contract)")
private Integer contractId;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "鎬婚噾棰�", example = "1")
- @ExcelColumn(name="鎬婚噾棰�")
+ @ApiModelProperty(value = "璐﹀崟閲戦", example = "1")
+ @ExcelColumn(name="璐﹀崟閲戦",index = 4,width = 6)
private BigDecimal totleFee;
- @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=鎶奸噾锛�3=淇濊瘉閲戯紱4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬", example = "1")
- @ExcelColumn(name="璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=鎶奸噾锛�3=淇濊瘉閲戯紱4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬")
+ @ApiModelProperty(value = "搴旀敹閲戦", example = "1")
+ @ExcelColumn(name="搴旀敹閲戦",index = 5,width = 6)
+ private BigDecimal receivableFee;
+
+ @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")
- @ExcelColumn(name="璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻")
private Integer billType;
+ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�")
+ @TableField(exist = false)
+ private Integer feeType;
+
@ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1")
- @ExcelColumn(name="鎵�灞炲叕鍙�")
private Integer companyId;
@ApiModelProperty(value = "浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�")
- @ExcelColumn(name="浠樻鐘舵�侊細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;
+
+ @ApiModelProperty(value = "閫�绉熸搷浣滄椂闂�")
+ @ExcelColumn(name="閫�绉熸搷浣滄椂闂�")
+ private Date btActDate;
+
+ @ApiModelProperty(value = "閫�绉熸搷浣滀汉锛堝叧鑱攕ystem_user)", example = "1")
+ @ExcelColumn(name="閫�绉熸搷浣滀汉锛堝叧鑱攕ystem_user)")
+ private Integer btActUserId;
+
+ @ApiModelProperty(value = "閫�绉熷師鍥�")
+ @ExcelColumn(name="閫�绉熷師鍥�")
+ private String btInfo;
+
+ @ApiModelProperty(value = "閫�绉熸棩鏈�")
+ @ExcelColumn(name="閫�绉熸棩鏈�")
+ private Date btDate;
+
+ @ApiModelProperty(value = "閫�绉熺粡鍔炰汉缂栫爜", example = "1")
+ @ExcelColumn(name="閫�绉熺粡鍔炰汉缂栫爜")
+ private Integer btUserId;
+
+ @ApiModelProperty(value = "閫�绉熺鍒版棩鏈�")
+ @ExcelColumn(name="閫�绉熺鍒版棩鏈�")
+ private Date btSignDate;
+
+ @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 String contractName;
@ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "鍗曞彿鏃ユ湡", example = "1",hidden = true)
+ @TableField(exist = false)
+ private String codeDate;
+
+
+ @ApiModelProperty(value = "鍚堝悓缂栧彿", example = "1")
+ @ExcelColumn(name="鍚堝悓缂栧彿",index = 2,width = 10)
+ @TableField(exist = false)
+ private String contractCode;
+
+ @ApiModelProperty(value = "妤煎畤鎴块棿", example = "1")
+ @ExcelColumn(name="妤煎畤鎴块棿",index = 1,width = 10)
+ @TableField(exist = false)
+ private String roomPathName;
+
+ @ApiModelProperty(value = "璁″垝浠樻鏃� - 寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date planPayDateStart;
+
+
+ @ApiModelProperty(value = "璁″垝浠樻鏃� - 缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date planPayDateEnd;
+
+ @ApiModelProperty(value = "瀹炴敹閲戦")
+ @TableField(exist = false)
+ @ExcelColumn(name="瀹炴敹閲戦",index = 6,width = 6)
+ private BigDecimal actReceivableFee;
+
+ @ApiModelProperty(value = "闇�鏀堕噾棰�")
+ @TableField(exist = false)
+ @ExcelColumn(name="闇�鏀堕噾棰�",index = 7,width = 6)
+ private BigDecimal needReceivableFee;
+
+ @ApiModelProperty(value = "鏄惁閫炬湡锛�0=鍚︼紱1=鏄�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡")
+ private Integer isOverdue;
+
@ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
@TableField(exist = false)
private List<Multifile> multifileList;
-
- @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
+ @ApiModelProperty(value = "鍏宠仈鎴块棿鏁版嵁", example = "1")
@TableField(exist = false)
private List<YwContractRoom> ywContractRoomList;
+ @ApiModelProperty(value = "鏀舵敮娴佹按", example = "1")
+ @TableField(exist = false)
+ private List<YwContractRevenue> ywContractRevenueList;
+
}
--
Gitblit v1.9.3