From 947688a33cd6b76917eedd3765e88bd05fdeb20d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 17 三月 2024 18:09:33 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 80 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 13 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 acb77ee..1ac0a30 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;
@@ -60,7 +61,7 @@
private String faceImg;
@ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
@ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
- private String faceServeIndexCode;
+ private String faceServerIndexCode;
@ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
@ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
private String faceId;
@@ -78,7 +79,7 @@
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
- @ApiModelProperty(value = "璁垮鍚嶇О")
+ @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@ExcelColumn(name="璁垮鍚嶇О")
private String name;
@@ -99,18 +100,24 @@
@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;
@@ -134,10 +141,10 @@
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 ", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@@ -147,7 +154,7 @@
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@ExcelColumn(name="ERP鏍囪瘑")
- private Integer erpId;
+ private String erpId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -183,9 +190,9 @@
@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="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
@@ -196,4 +203,51 @@
@ExcelColumn(name="ERP缁勭粐缂栫爜")
private String erpOrgId;
+ @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
+ @ExcelColumn(name="璁垮鍏徃鍚嶇О")
+ private String visitCompanyName;
+
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
+ @TableField(exist = false)
+ private String hkOrgId;
+ @ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ")
+ @TableField(exist = false)
+ private String roleIdParam;
+
+ @ApiModelProperty(value = "鍓嶇紑鍦板潃")
+ @TableField(exist = false)
+ private String prefixUrl;
+
+ @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 = "鏈�鍚庤闂椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date lastVisitDate;
+
+ @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
+ private Date startTime;
+
+ @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
+ private Date endTime;
+
}
--
Gitblit v1.9.3