From 18923f94dd3117aa6232e351abf7be79b365513a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期三, 20 十二月 2023 15:12:23 +0800
Subject: [PATCH] 前后端联调，接口字段回显调整
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 86 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 14 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 47773d3..7b67428 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@
/**
* 浜哄憳淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳淇℃伅琛�")
@@ -58,7 +59,18 @@
@ApiModelProperty(value = "浜鸿劯鐓х墖")
@ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
-
+ @ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
+ @ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
+ private String faceServerIndexCode;
+ @ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
+ @ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
+ private String faceId;
+ @ApiModelProperty(value = "浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ExcelColumn(name="浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ private Integer faceStatus;
+ @ApiModelProperty(value = "浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
+ @ExcelColumn(name="浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
+ private String faceInfo;
@ApiModelProperty(value = "鍋ュ悍鐮�")
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
@@ -87,19 +99,23 @@
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
@ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
private String idcardDecode;
-
+ @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
+ @ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
+ private Integer idcardType;
@ApiModelProperty(value = "宸ュ彿")
@ExcelColumn(name="宸ュ彿")
private String code;
- @ApiModelProperty(value = "鐝")
- @ExcelColumn(name="鐝")
- private String classes;
+ @ApiModelProperty(value = "鐝 0鐧界彮 1澶滅彮")
+ @ExcelColumn(name="鐝 0鐧界彮 1澶滅彮")
+ private Integer classes;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨")
private Integer status;
-
+ @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
+ @ExcelColumn(name="鎬у埆 1鐢� 2濂�")
+ private Integer sex;
@ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
@ExcelColumn(name="娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級")
private Integer parentId;
@@ -123,10 +139,10 @@
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 ", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@@ -136,7 +152,7 @@
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@ExcelColumn(name="ERP鏍囪瘑")
- private Integer erpId;
+ private String erpId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -172,8 +188,50 @@
@ExcelColumn(name="鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�")
private Integer highCheckor;
- @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄oor_role)", example = "1")
- @ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄oor_role)")
- private Integer roleId;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
+ @ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜 ")
+ private String roleId;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
+ @ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date roleDate;
+
+ @ApiModelProperty(value = "ERP缁勭粐缂栫爜")
+ @ExcelColumn(name="ERP缁勭粐缂栫爜")
+ private String erpOrgId;
+
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
+ @TableField(exist = false)
+ private String companyHkId;
+ @ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ")
+ @TableField(exist = false)
+ private String roleIdParam;
+
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true )
+ @TableField(exist = false)
+ private Integer[] roleIds;
+
+ //鏆傛棤浣跨敤
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
+ @TableField(exist = false)
+ private String keyword;
+
+ @ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱")
+ @TableField(exist = false)
+ private Integer isFace;
+
+ @ApiModelProperty(value = "璁块棶娆℃暟")
+ @TableField(exist = false)
+ private Integer visitTimes;
+
+ @ApiModelProperty(value = "鏈�鍚庤闂椂闂�")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date lastVisitDate;
+
}
--
Gitblit v1.9.3