From 42df87e4459821a18aa8e4998ed94c50f1e1ca70 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 28 二月 2024 11:12:20 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 43185bf..46533db 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -23,114 +23,96 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
- @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
private Integer companyId;
@ApiModelProperty(value = "浜鸿劯鐓х墖")
- @ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
+
@ApiModelProperty(value = "鍋ュ悍鐮�")
- @ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
+ @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 2, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О")
- @ExcelColumn(name="璁垮鍚嶇О")
+ @ExcelColumn(name="濮撳悕" ,index = 3,width = 6)
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
- @ExcelColumn(name="璁垮骞撮緞")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 4,width = 12)
private String phone;
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="韬唤璇佸彿" ,index = 5,width = 12)
private String idcardDecode;
@ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿")
private String code;
@ApiModelProperty(value = "鐝")
- @ExcelColumn(name="鐝")
private Integer classes;
+
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
- @ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О")
+ @ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
private String deviceName;
+
@ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
- @ExcelColumn(name="娴峰悍闂ㄧ缂栫爜")
private String deviceIndex;
+
@ApiModelProperty(value = "鍏ュ巶鏃堕棿")
- @ExcelColumn(name="鍏ュ巶鏃堕棿")
+ @ExcelColumn(name="杩涘満鏃堕棿" ,index = 7,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date eventDate;
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
- @ExcelColumn(name="璁垮ID(鍏宠仈member)")
private Integer memberId;
@ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
- @ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
private String eventCode;
@ApiModelProperty(value = "杞︾墝鍙凤紙type=3浣跨敤锛�")
- @ExcelColumn(name="杞︾墝鍙凤紙type=3浣跨敤锛�")
private String carNo;
@ApiModelProperty(value = "鍏徃缁勭粐")
- @ExcelColumn(name="鍏徃缁勭粐")
@TableField(exist = false)
public String companyName;
@ApiModelProperty(value = "璁垮缁勭粐鍚嶇О")
- @ExcelColumn(name="璁垮缁勭粐鍚嶇О")
@TableField(exist = false)
public String visitCompanyName;
- // 鏉′欢鏌ヨ鍙傛暟
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
@TableField(exist = false)
private String keyWords;
@@ -142,9 +124,14 @@
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField(exist = false)
private Date endTime;
+
@ApiModelProperty(value = "浜鸿劯鐓х墖")
@TableField(exist = false)
private String faceImgFull;
+ @ApiModelProperty(value = "瀵煎嚭鍏徃鍚嶇О",hidden = true)
+ @ExcelColumn(name="鍏徃/缁勭粐" ,index = 1,width = 12)
+ @TableField(exist = false)
+ public String excelCompanyName;
}
--
Gitblit v1.9.3