From 66b84de58e3efae14c1e258ee716e02ad9557497 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 09 十月 2025 08:48:50 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 72 +++++++++++++++++++++++++++++------ 1 files changed, 59 insertions(+), 13 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 3ae9442..36a8235 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,15 +1,17 @@ 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 com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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 = "鐘舵�佷俊鎭�") @@ -80,9 +80,12 @@ @ExcelColumn(name="瀹℃壒澶囨敞") private String checkInfo; - @ApiModelProperty(value = "瀹℃壒浜�") - @ExcelColumn(name="瀹℃壒浜�") + @ApiModelProperty(value = "瀹為檯瀹℃壒浜�") + @ExcelColumn(name="瀹為檯瀹℃壒浜�") private String cheorId; + + @ApiModelProperty(value = "瀹℃壒鏃堕棿") + private Date checkDate; @ApiModelProperty(value = "瀹℃壒浜哄鍚�") @ExcelColumn(name="瀹℃壒浜哄鍚�") @@ -96,19 +99,62 @@ @ExcelColumn(name="鍏宠仈涓氬姟涓婚敭") private Integer objId; - @ApiModelProperty(value = "鍏宠仈涓氬姟绫诲瀷锛�0=璁垮鐢宠锛�1=鐢ㄨ溅鐢宠", example = "1") - @ExcelColumn(name="鍏宠仈涓氬姟绫诲瀷锛�0=璁垮鐢宠锛�1=鐢ㄨ溅鐢宠") - private Integer objType; @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甯傚叕鍙哥墿娴佽溅棰勭害 6鍏ュ洯鍘熷洜", example = "1") + @ExcelColumn(name="鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害 6鍏ュ洯鍘熷洜") + 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 = "openid", example = "1") + @ExcelColumn(name="openid") + @TableField(exist = false) + private String systemOpenid; + + + @ApiModelProperty(value = "寰呭鎵硅褰�", example = "1") + @TableField(exist = false) + private List<Approve> approveList; + } -- Gitblit v1.9.3