From e9717d6ebed478c4ff7ddbf539d1a591bbf5185a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 10:49:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 05d9e2e..0c89c3b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.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 com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒淇℃伅璁板綍琛�
@@ -32,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -41,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -68,8 +68,8 @@
@ExcelColumn(name="ERP瀹℃壒缂栫爜")
private String erpId;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞�", example = "1")
- @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞�")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4宸插彇娑� 5浠栦汉鎴栫 6浠栦汉鎷掔粷", example = "1")
+ @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4宸插彇娑� 5浠栦汉鎴栫 6浠栦汉鎷掔粷")
private Integer status;
@ApiModelProperty(value = "鐘舵�佷俊鎭�")
@@ -84,6 +84,9 @@
@ExcelColumn(name="瀹℃壒浜�")
private String cheorId;
+ @ApiModelProperty(value = "瀹℃壒鏃堕棿")
+ private Date checkDate;
+
@ApiModelProperty(value = "瀹℃壒浜哄鍚�")
@ExcelColumn(name="瀹℃壒浜哄鍚�")
private String checkorName;
@@ -92,19 +95,61 @@
@ExcelColumn(name="鏄惁缁堝 0鍚� 1鏄�")
private Integer isEndCheck;
- @ApiModelProperty(value = "璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�", example = "1")
- @ExcelColumn(name="璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�")
- private Integer visitId;
+ @ApiModelProperty(value = "鍏宠仈涓氬姟涓婚敭", example = "1")
+ @ExcelColumn(name="鍏宠仈涓氬姟涓婚敭")
+ private Integer objId;
+
@ApiModelProperty(value = "瀹℃壒绛夌骇", example = "1")
@ExcelColumn(name="瀹℃壒绛夌骇")
private Integer level;
- @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱", example = "1")
- @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱")
+ @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒", example = "1")
+ @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒")
private Integer approveType;
+
+
+ @ApiModelProperty(value = "鏄惁鎸囧畾鍙告満椤� 0涓嶆寚瀹� 1鎸囧畾", example = "1")
+ @ExcelColumn(name="鏄惁鎸囧畾鍙告満椤� 0涓嶆寚瀹� 1鎸囧畾")
+ private Integer driverParam;
+
+ @ApiModelProperty(value = "鏄惁淇敼鐩殑鍦� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁淇敼鐩殑鍦� 0鍚� 1鏄�")
+ private Integer addrParam;
+
+ @ApiModelProperty(value = "鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害", example = "1")
+ @ExcelColumn(name="鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害")
+ private Integer objType;
@ApiModelProperty(value = "绫诲瀷 0瀹℃壒 1鎶勯��", example = "1")
@ExcelColumn(name="绫诲瀷 0瀹℃壒 1鎶勯��")
private Integer type;
+
+
+
+ @ApiModelProperty(value = "浜鸿劯鍥剧墖", example = "1")
+ @TableField(exist = false)
+ private String faceImg;
+
+ @ApiModelProperty(value = "濮撳悕", example = "1")
+ @ExcelColumn(name="濮撳悕")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+ @ExcelColumn(name="鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "閮ㄩ棬", example = "1")
+ @ExcelColumn(name="閮ㄩ棬")
+ @TableField(exist = false)
+ private String companyName;
+
+
+
+ @ApiModelProperty(value = "寰呭鎵硅褰�", example = "1")
+ @TableField(exist = false)
+ private List<Approve> approveList;
+
}
--
Gitblit v1.9.3