From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 87a786e..edf4ba3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -52,27 +52,31 @@
@ApiModelProperty(value = "鍋ュ悍鐮�")
private String imgurl;
-
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
- @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 2, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
+ //鐢ㄦ埛绫诲瀷 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ")
+// @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 5, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;4=鐩稿叧鏂逛汉鍛�;5=璐ц繍鍙告満",width = 8)
private Integer type;
+ @ApiModelProperty(value = " 绫诲瀷 0鐩稿叧鏂圭粍缁� 1鍐呴儴浜哄憳 2璁垮")
+ @TableField(exist = false)
+// @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 5, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
+ private String typeName;
@ApiModelProperty(value = "璁垮鍚嶇О")
- @ExcelColumn(name="濮撳悕" ,index = 3,width = 6)
+ @ExcelColumn(name="濮撳悕" ,index = 1,width = 6)
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�" ,index = 4,width = 12)
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 2,width = 12)
private String phone;
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="韬唤璇佸彿" ,index = 5,width = 12)
+ @ExcelColumn(name="韬唤璇佸彿" ,index = 3,width = 12)
private String idcardDecode;
@ApiModelProperty(value = "宸ュ彿")
@@ -84,7 +88,8 @@
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
@ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
private String deviceName;
-
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 6鏈櫥璁拌溅杈� ")
+ private Integer carType ;
@ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
private String deviceIndex;
@@ -95,6 +100,8 @@
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
private Integer memberId;
+ @ApiModelProperty(value = "璁垮1闂ㄧ浜嬩欢2杞﹁締浜嬩欢")
+ private String accessType;
@ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
private String eventCode;
@@ -115,6 +122,13 @@
@TableField(exist = false)
private String keyWords;
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ @TableField(exist = false)
+ private Integer companyType;
+ @ApiModelProperty(value = "绫诲瀷 0璁垮 1鍐呴儴浜哄憳")
+ @TableField(exist = false)
+ private Integer memberType;
+
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
private Date startTime;
@@ -128,8 +142,37 @@
private String faceImgFull;
@ApiModelProperty(value = "瀵煎嚭鍏徃鍚嶇О",hidden = true)
- @ExcelColumn(name="鍏徃/缁勭粐" ,index = 1,width = 12)
+ @ExcelColumn(name="鍏徃/缁勭粐" ,index = 4,width = 12)
@TableField(exist = false)
public String excelCompanyName;
+
+ @ApiModelProperty(value = "浜烘暟")
+ @TableField(exist = false)
+ private Integer num;
+
+ @ApiModelProperty(value = "鏌ヨ浜哄憳绫诲瀷")
+ @TableField(exist = false)
+ private Integer queryUserType;
+
+ @ApiModelProperty(value = "鍏宠仈鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1")
+ @ExcelColumn(name="鍏宠仈鍒嗙被缂栫爜锛堝叧鑱攃ategory)")
+ private Integer categoryId;
+
+ @ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
+ private String categoryName;
+
+ @ApiModelProperty(value = "鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1")
+ private Integer categoryParentId;
+
+ @ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
+ @ExcelColumn(name="鍏宠仈鍒嗙被鍚嶇О")
+ private String categoryParentName;
+
+
+ @ApiModelProperty(value = "0=璁垮杞﹁締;1=澶栧崗杩愯緭杞﹁締;2=甯傚叕鍙稿嵏璐ц溅杈�;3=鍔犲伐鐑熷嵏璐ц溅杈�;4=瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締 ")
+ @ExcelColumn(name="杞﹁締鍒嗙被" ,index = 8,width = 16,valueMapping ="0=璁垮杞﹁締;1=澶栧崗杩愯緭杞﹁締;2=甯傚叕鍙稿嵏璐ц溅杈�;3=鍔犲伐鐑熷嵏璐ц溅杈�;4=瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締;" )
+ @TableField(exist = false)
+ private Integer bizType;
+
}
--
Gitblit v1.9.3