From b142b67b25531fa9df35bb42500596bd7616f319 Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期六, 23 十一月 2024 17:18:10 +0800 Subject: [PATCH] 客户资料 巡检任务业务 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 2 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 017e3be..121375e 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 @@ -1,7 +1,10 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import com.doumee.core.model.LoginUserModel; +import com.doumee.core.utils.Constants; +import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -11,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 杩愮淮鍚堝悓璐﹀崟淇℃伅琛� @@ -56,8 +60,8 @@ @ApiModelProperty(value = "绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃ 2绉熻祦鎶奸噾 3鐗╀笟鎶奸噾", example = "1") @ExcelColumn(name="绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃ 2绉熻祦鎶奸噾 3鐗╀笟鎶奸噾") private Integer type; - @ApiModelProperty(value = "鐘舵�� 0鏈紑濮嬶紱1杩涜涓紱2宸插畬鎴愶紱", example = "1") - @ExcelColumn(name="鐘舵�� 0鏈紑濮嬶紱1杩涜涓紱2宸插畬鎴愶紱") + @ApiModelProperty(value = "鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�", example = "1") + @ExcelColumn(name="鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�") private Integer status; @ApiModelProperty(value = "寮�濮嬫椂闂�") @@ -74,6 +78,17 @@ @ExcelColumn(name="缁撴潫鏃堕棿") private Date endDate; + + @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; + @ApiModelProperty(value = "鍚堝悓鏉℃缂栫爜锛堝叧鑱攜w_contract_detail)", example = "1") @ExcelColumn(name="鍚堝悓鏉℃缂栫爜锛堝叧鑱攜w_contract_detail)") private Integer detailId; @@ -90,4 +105,41 @@ @ExcelColumn(name="鎬婚噾棰�") private BigDecimal totleFee; + @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=鎶奸噾锛�3=淇濊瘉閲戯紱4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬", example = "1") + @ExcelColumn(name="璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=鎶奸噾锛�3=淇濊瘉閲戯紱4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬") + private Integer costType; + + @ApiModelProperty(value = "璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻", example = "1") + @ExcelColumn(name="璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻") + private Integer billType; + + @ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1") + @ExcelColumn(name="鎵�灞炲叕鍙�") + private Integer companyId; + + @ApiModelProperty(value = "浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆�") + @ExcelColumn(name="浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆�") + private Integer payStatus; + + @ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1") + @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") + @TableField(exist = false) + private List<Multifile> multifileList; + + + @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1") + @TableField(exist = false) + private List<YwContractRoom> ywContractRoomList; + } -- Gitblit v1.9.3