From bc46f9370b6ea7a4592eed2827f4f0368e4ba3b5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 26 十一月 2024 09:42:23 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
index c0bad0d..8c374fa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.constants.OperaType;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.business.vo.EditRecordDataVO;
+import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,8 +13,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 杩愮淮鍚堝悓鏀舵敮娴佹按
@@ -25,77 +31,114 @@
@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="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃ユ湡",index = 8,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
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 = "鐘舵�� 0=寮�鍚紱1=鍏抽棴", example = "1")
- @ExcelColumn(name="鐘舵�� 0=寮�鍚紱1=鍏抽棴")
+ @ExcelColumn(name="鐘舵��",index = 10,width = 10,valueMapping = "0=寮�鍚�;1=鍏抽棴")
private Integer status;
- @ApiModelProperty(value = "瀹炴敹閲戦", example = "1")
- @ExcelColumn(name="瀹炴敹閲戦")
+ @ApiModelProperty(value = "鍙戠敓閲戦", example = "1")
+ @ExcelColumn(name="鍙戠敓閲戦",index = 5,width = 10)
private BigDecimal actReceivableFee;
@ApiModelProperty(value = "瀹為檯浠樻鏃�")
- @ExcelColumn(name="瀹為檯浠樻鏃�")
+ @ExcelColumn(name="鍏ヨ处鏃ユ湡",index = 7,width = 10,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date actPayDate;
@ApiModelProperty(value = "浠樻绫诲瀷锛�0=鐜伴噾锛�1=缃戦摱杞处锛�2=POS鏈猴紱3=鏀粯瀹濓紱4=寰俊锛�5=杞处鏀エ锛�6=鍏朵粬", example = "1")
- @ExcelColumn(name="浠樻绫诲瀷锛�0=鐜伴噾锛�1=缃戦摱杞处锛�2=POS鏈猴紱3=鏀粯瀹濓紱4=寰俊锛�5=杞处鏀エ锛�6=鍏朵粬")
+ @ExcelColumn(name="鏀舵鏂瑰紡",index = 6,width = 10,valueMapping = "0=鐜伴噾;1=缃戦摱杞处;2=POS鏈�;3=鏀粯瀹�;4=寰俊;5=杞处鏀エ;6=鍏朵粬;")
private Integer payType;
@ApiModelProperty(value = "鎵�灞炲叕鍙革紙鍏宠仈 company锛�", example = "1")
- @ExcelColumn(name="鎵�灞炲叕鍙革紙鍏宠仈 company锛�")
private Integer companyId;
@ApiModelProperty(value = "鏀舵敮璐︽埛锛堝叧鑱攜w_account)", example = "1")
- @ExcelColumn(name="鏀舵敮璐︽埛锛堝叧鑱攜w_account)")
private Integer accountId;
@ApiModelProperty(value = "鍚堝悓涓婚敭锛堝叧鑱攜w_contract锛�", example = "1")
- @ExcelColumn(name="鍚堝悓涓婚敭锛堝叧鑱攜w_contract锛�")
private Integer contractId;
@ApiModelProperty(value = "璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�", example = "1")
- @ExcelColumn(name="璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�")
private Integer billId;
@ApiModelProperty(value = "鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭", example = "1")
- @ExcelColumn(name="鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭")
+ @ExcelColumn(name="鏀舵敮绫诲瀷",index = 4,width = 10,valueMapping = "0=鏀跺叆;1=鏀嚭")
private Integer revenueType;
+
+
+ @ApiModelProperty(value = "鍚堝悓缂栧彿", example = "1")
+ @ExcelColumn(name="鍚堝悓缂栧彿",index = 1,width = 10)
+ @TableField(exist = false)
+ private String contractCode;
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@TableField(exist = false)
private String customerNme;
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1")
+ @ExcelColumn(name="瀹㈡埛鍚嶇О",index = 0,width = 10)
+ @TableField(exist = false)
+ private String customerName;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @ExcelColumn(name="鍒涘缓浜�",index = 9,width = 10)
+ private String realname;
+
+ @ApiModelProperty(value = "鍏宠仈鎴块棿鏁版嵁", example = "1")
+ @TableField(exist = false)
+ private List<YwContractRoom> ywContractRoomList;
+
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "鍏ヨ处鏃ユ湡 - 寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date payDateStart;
+
+ @ApiModelProperty(value = "鍏ヨ处鏃ユ湡 - 缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date payDateEnd;
+
+ @ApiModelProperty(value = "妤煎畤鎴块棿", example = "1")
+ @ExcelColumn(name="鎴垮彿",index = 2,width = 10)
+ @TableField(exist = false)
+ private String roomPathName;
+
+ @ApiModelProperty(value = "璐﹀崟缂栧彿", example = "1")
+ @ExcelColumn(name="璐﹀崟缂栧彿",index = 3,width = 16)
+ @TableField(exist = false)
+ private String billCode;
+
+ @ApiModelProperty(value = "鎿嶄綔璁板綍", example = "1")
+ @TableField(exist = false)
+ private List<EditRecordDataVO> editRecordDataVOList;
+
}
--
Gitblit v1.9.3