From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 19 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 9068475..0c23522 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,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserModel;
+import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -22,7 +25,7 @@
@Data
@ApiModel("璁垮鐢宠淇℃伅琛�")
@TableName("`visits`")
-public class Visits {
+public class Visits extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -44,8 +47,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
@@ -70,24 +72,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;
@@ -149,8 +145,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂� 9宸插け鏁�", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂� 9宸插け鏁�")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
@@ -159,7 +155,6 @@
@ApiModelProperty(value = "鍒濆鏃堕棿")
@ExcelColumn(name="鍒濆鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "鍒濆澶囨敞")
@@ -172,7 +167,6 @@
@ApiModelProperty(value = "缁堝鏃堕棿")
@ExcelColumn(name="缁堝鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endCheckDate;
@ApiModelProperty(value = "缁堝澶囨敞")
@@ -199,9 +193,12 @@
@ExcelColumn(name="绛旈璁板綍缂栫爜锛堝叧鑱攗ser_answer)")
private Integer userAnswerId;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑")
- @ExcelColumn(name="娴峰悍鏍囪瘑")
+ @ApiModelProperty(value = "娴峰悍璁垮鏍囪瘑")
+ @ExcelColumn(name="娴峰悍璁垮鏍囪瘑")
private String hkId;
+ @ApiModelProperty(value = "娴峰悍棰勭害鏍囪瘑")
+ @ExcelColumn(name="娴峰悍棰勭害鏍囪瘑")
+ private String hkRecordId;
@ApiModelProperty(value = "openid")
@ExcelColumn(name="openid")
private String openid;
@@ -220,12 +217,14 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜")
@ExcelColumn(name="ERP鐢宠璁板綍缂栫爜")
private String erpId;
+
+ @ApiModelProperty(value = "鏄惁鍙戦�佽秴鏃堕�氱煡 0锛氭湭鍙戦�侊紱1=宸插彂閫�")
+ private Integer sendTimeOutNotice;
@ApiModelProperty(value = "缁熻鏁伴噺 ")
@@ -239,13 +238,17 @@
@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;
// @ApiModelProperty(value = "鐝")
// private String memberClasses;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
@TableField(exist = false)
private Integer memberType;
@ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
@@ -262,6 +265,11 @@
@ExcelColumn(name="琚浜哄憳濮撳悕")
@TableField(exist = false)
private String receptMemberName;
+
+ @ApiModelProperty(value = "琚浜哄憳鐢佃瘽", example = "1")
+ @ExcelColumn(name="琚浜哄憳鐢佃瘽")
+ @TableField(exist = false)
+ private String receptMemberMobile;
@ApiModelProperty(value = "琚浜哄憳娴峰悍缂栫爜", example = "1")
@ExcelColumn(name="琚浜哄憳濮撳悕")
@TableField(exist = false)
@@ -297,4 +305,45 @@
@ApiModelProperty(value = "绂诲満鐘舵�侊紱0=鏈鍦�", example = "1",hidden = true)
@TableField(exist = false)
private Integer levelStatus;
+
+ @ApiModelProperty(value = "涓氬姟瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ", example = "1")
+ @TableField(exist = false)
+ private Integer businessStatus;
+
+
+ @ApiModelProperty(value = "鍒涘缓浜哄鍚�", example = "1")
+ @TableField(exist = false)
+ private String createMemberName;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹數璇�", example = "1")
+ @TableField(exist = false)
+ private String createMobile;
+
+ @ApiModelProperty(value = "鍚庣鍒涘缓浜�", example = "1",hidden = true)
+ @TableField(exist = false)
+ private LoginUserInfo loginUserInfo;
+
+ @ApiModelProperty(value = "閫氱煡鎻忚堪")
+ @TableField(exist = false)
+ private String info;
+ @ApiModelProperty(value = "褰撳墠鏄惁鍦ㄥ洯")
+ @TableField(exist = false)
+ private Integer retentionNum;
+
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
+ @TableField(exist = false)
+ private ApproveDataVO approveDateVO;
+
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryStarttime;
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryEndtime;
+
+
}
--
Gitblit v1.9.3