From cc80794e556bbe1e43f9c1369e1dfc9c61318fda Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 07 三月 2024 14:57:10 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index 1aa61b3..3f3f823 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -28,13 +28,10 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
private String creator;
-
-
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
private String edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -51,19 +48,15 @@
@ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
private Integer memberId;
+
@ApiModelProperty(value = "璁惧缂栫爜", example = "1")
private Integer deviceId;
-
-
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
private Integer importStatus;
@ApiModelProperty(value = "瀵煎叆澶囨敞")
private String importInfo;
-
-
-
@ApiModelProperty(value = "涓嬪彂浜哄憳", example = "1")
@@ -73,11 +66,14 @@
private Integer cancelUserId;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
- private String cANCElInfo;
+ private String cancelInfo;
+
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @TableField(exist = false)
+ private String deviceName;
@ApiModelProperty(value = "鎵�灞炲叕鍙哥紪鐮�")
@TableField(exist = false)
@@ -112,28 +108,27 @@
private Date endTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
@ExcelColumn(name="鎿嶄綔浜�",index= 7)
@TableField(exist = false)
private String createrName;
+ @ApiModelProperty(value = "鍗＄墖闆嗗悎锛堣嫳鏂囬�楀彿闅斿紑锛�")
+ private String cardNos;
- @ApiModelProperty(value = "涓嬪彂鐘舵�� 0寰呬笅鍙� 1宸蹭笅鍙� 2宸插彇娑�", example = "1")
- @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=宸插彇娑�" )
+ @ApiModelProperty(value = "涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1浠诲姟鎵ц 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉� 6涓嶇鍚堜笅鍙戞潯浠� ", example = "1")
+ @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=涓嬪彂鎴愬姛;3=宸插彇娑�;4=涓嬪彂澶辫触;5=浠诲姟涓嬭浇宸茬粨鏉�;6==涓嶇鍚堜笅鍙戞潯浠�" )
private Integer sendStatus;
@ApiModelProperty(value = "涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ", example = "1")
@ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂" )
private Integer sendType;
-
-
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate;
@ApiModelProperty(value = "涓嬪彂澶囨敞")
@@ -150,5 +145,17 @@
@ApiModelProperty(value = "鏃堕棿娈�0锛�7,30")
@TableField(exist = false)
private Integer timeDn;
+ @ApiModelProperty(value = "鏃堕棿娈�0锛�7,30")
+ @TableField(exist = false)
+ private String deviceChannelNo;
+ @ApiModelProperty(value = "娴峰悍璁惧绫诲瀷code")
+ @TableField(exist = false)
+ private String deviceType;
+ @ApiModelProperty(value = "娴峰悍璁惧ode")
+ @TableField(exist = false)
+ private String deviceIndexCode;
+ @ApiModelProperty(value = "浜哄憳娴峰悍缂栫爜")
+ @TableField(exist = false)
+ private String memberHkId;
}
--
Gitblit v1.9.3