From 8725ebeaadc6714823593a6b10a0dd9acdf0d14a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 27 五月 2024 17:19:34 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java index ec899e7..bf78546 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -22,7 +23,7 @@ @Data @ApiModel("璁垮鐢宠淇℃伅琛�") @TableName("`visits`") -public class Visits { +public class Visits extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -69,24 +70,18 @@ @ApiModelProperty(value = "鍋ュ悍鐮�") @ExcelColumn(name="鍋ュ悍鐮�") private String imgurl; - - @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� ", example = "1") - @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� ") + @ApiModelProperty(value = "绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ", example = "1") + @ExcelColumn(name="绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ") private Integer type; - @ApiModelProperty(value = "璁垮鍚嶇О") @ExcelColumn(name="璁垮鍚嶇О") private String name; - @ApiModelProperty(value = "璁垮骞撮緞") @ExcelColumn(name="璁垮骞撮緞") - @JsonFormat(pattern = "yyyy-MM-dd") private Date birthday; - @ApiModelProperty(value = "鎵嬫満鍙�") @ExcelColumn(name="鎵嬫満鍙�") private String phone; - @ApiModelProperty(value = "浼佷笟鍚嶇О") @ExcelColumn(name="浼佷笟鍚嶇О") private String companyName; @@ -158,7 +153,6 @@ @ApiModelProperty(value = "鍒濆鏃堕棿") @ExcelColumn(name="鍒濆鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date checkDate; @ApiModelProperty(value = "鍒濆澶囨敞") @@ -171,7 +165,6 @@ @ApiModelProperty(value = "缁堝鏃堕棿") @ExcelColumn(name="缁堝鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date endCheckDate; @ApiModelProperty(value = "缁堝澶囨敞") @@ -219,7 +212,6 @@ @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�") @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�") - @JsonFormat(pattern = "yyyy-MM-dd") private Date hkDate; @ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜") @@ -238,6 +230,10 @@ @ApiModelProperty(value = "鏉ユ簮绫诲瀷锛�0=鏈郴缁燂紱1=ERP", example = "1") private Integer sourceType; + @ApiModelProperty(value = "鏂藉伐浜嬬敱") + @ExcelColumn(name="鏂藉伐浜嬬敱") + private String constructionReason; + @ApiModelProperty(value = "鏅�氳瀹㈢敵璇烽殢璁夸汉鍛�") @TableField(exist = false) private List<Visits> withUserList; -- Gitblit v1.9.3