From 9ab109b9ee96e7ff2bf2b935a044aee5842a3ddc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期日, 28 九月 2025 10:08:09 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java | 88 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 25 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
index 2cd16fa..80a4a5f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.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;
@@ -22,93 +23,130 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 9,width = 18,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ @ExcelColumn(name="澶囨敞",index = 10,width = 16)
private String remark;
@ApiModelProperty(value = "瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳", example = "1")
- @ExcelColumn(name="瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳")
private Integer type;
@ApiModelProperty(value = "娴峰悍浜嬩欢缂栫爜")
- @ExcelColumn(name="娴峰悍浜嬩欢缂栫爜")
private String hkEventId;
@ApiModelProperty(value = "娴峰悍浜嬩欢瀵硅薄缂栫爜")
- @ExcelColumn(name="娴峰悍浜嬩欢瀵硅薄缂栫爜")
private String hkId;
@ApiModelProperty(value = "鍏宠仈浜哄憳缂栫爜锛堝叧鑱攎ember)", example = "1")
- @ExcelColumn(name="鍏宠仈浜哄憳缂栫爜锛堝叧鑱攎ember)")
private Integer memberId;
@ApiModelProperty(value = "鍏宠仈浜哄憳缂栫爜锛堝叧鑱攃ars)", example = "1")
- @ExcelColumn(name="鍏宠仈浜哄憳缂栫爜锛堝叧鑱攃ars)")
private Integer carId;
@ApiModelProperty(value = "鍏宠仈鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1")
- @ExcelColumn(name="鍏宠仈鍒嗙被缂栫爜锛堝叧鑱攃ategory)")
private Integer categoryId;
@ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
- @ExcelColumn(name="鍏宠仈鍒嗙被鍚嶇О")
+ @ExcelColumn(name="杞﹁締鍒嗙被",index = 6,width = 16)
private String categoryName;
- @ApiModelProperty(value = "", example = "1")
- @ExcelColumn(name="")
+ @ApiModelProperty(value = "鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1")
+ private Integer categoryParentId;
+
+ @ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
+ private String categoryParentName;
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 涓氬姟绫诲瀷 0=璁垮杞﹁締-璁垮杞﹁締 ;" +
+ "1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;" +
+ "2=wms甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�;" +
+ "3=wms銆佸畨娉扮殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-鍔犲伐鐑熷嵏璐ц溅杈� ;" +
+ "4=wms瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;" +
+ "5=wms瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締;" +
+ "6=鏈煡杞﹁締; ", example = "1")
+// @ExcelColumn(name="杞﹁締涓氬姟绫诲瀷",index = 5,width = 16,valueMapping = "0=璁垮杞﹁締-璁垮杞﹁締;1=璐ц繍杞﹁締-澶栧崗杩愯緭杞﹁締;2=璐ц繍杞﹁締-甯傚叕鍙稿嵏璐ц溅杈�;3=璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�;4=鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締;")
private Integer carBizType;
- @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満", example = "1")
- @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満")
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ", example = "1")
+ @ExcelColumn(name="鐢ㄦ埛绫诲瀷",index = 3,width = 16,valueMapping = "0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;4=鐩稿叧鏂逛汉鍛�;5=璐ц繍鍙告満;")
private Integer memberType;
@ApiModelProperty(value = "浜哄憳鍚嶇О")
- @ExcelColumn(name="浜哄憳鍚嶇О")
+ @ExcelColumn(name="浜哄憳鍚嶇О",index = 0,width = 16)
private String memberName;
+ @ApiModelProperty(value = "浜哄憳鎵嬫満鍙�")
+ @ExcelColumn(name="浜哄憳鎵嬫満鍙�",index = 1,width = 16)
+ private String memberPhone;
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ExcelColumn(name="缁勭粐鍚嶇О",index = 2,width = 16)
+ private String companyName;
+ @ApiModelProperty(value = "鍏宠仈缁勭粐缂栫爜")
+ private Integer companyId;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�",index = 4,width = 16)
private String carCode;
@ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳 2璁垮鐢宠璁板綍 3璁垮鎶ュ鐢宠璁板綍 4鏈堝彴浣滀笟璁板綍", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳 2璁垮鐢宠璁板綍 3璁垮鎶ュ鐢宠璁板綍 4鏈堝彴浣滀笟璁板綍")
private Integer objType;
+ @ApiModelProperty(value = "缁熻鏃ユ湡锛�2024-10-12 00:00:00锛�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date timeInfo;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
private Integer objId;
@ApiModelProperty(value = "杩涘嚭绫诲瀷 0杩� 1鍑�", example = "1")
- @ExcelColumn(name="杩涘嚭绫诲瀷 0杩� 1鍑�")
+ @ExcelColumn(name="杩涘嚭绫诲瀷",index = 7,width = 10,valueMapping = "0=杩�;1=鍑�;")
private Integer inOrOut;
@ApiModelProperty(value = "杩涘嚭璁惧鍚嶇О")
- @ExcelColumn(name="杩涘嚭璁惧鍚嶇О")
+ @ExcelColumn(name="杩涘嚭绫诲瀷",index = 8,width = 10)
private String deviceName;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖")
+ @TableField(exist = false)
+ private String faceImg;
+ @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
+ @TableField(exist = false)
+ private String idcardNo;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @TableField(exist = false)
+ private String idcardDecode;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @TableField(exist = false)
+ private String memberCode;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿 寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿 缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+ @TableField(exist = false)
+ private String createDateStr;
+
+
+
}
--
Gitblit v1.9.3