From 568e38a95cb6fb20fe16b53d17f610aefc6f744f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 09 十月 2025 18:29:29 +0800
Subject: [PATCH] 钉钉通知 与钥匙柜开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 143 ++++++++++++++++++++++++++++++++---------------
1 files changed, 96 insertions(+), 47 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index 32d6904..cc1f7cd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -1,14 +1,18 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserModel;
+import com.doumee.dao.business.vo.ApproveDataVO;
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;
/**
* 杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�
@@ -18,131 +22,176 @@
@Data
@ApiModel("杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�")
@TableName("`car_use_book`")
-public class CarUseBook {
-
+public class CarUseBook extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鐢宠鏃堕棿",index =11,width = 10)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
+ @ExcelColumn(name="鎿嶄綔鏃堕棿",index =12,width = 10)
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�",index =1,width = 8)
private String carCode;
@ApiModelProperty(value = "杞﹁締缂栫爜锛堝叧鑱攃ars)", example = "1")
- @ExcelColumn(name="杞﹁締缂栫爜锛堝叧鑱攃ars)")
+ //@ExcelColumn(name="杞﹁締缂栫爜锛堝叧鑱攃ars)")
private Integer carId;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- @ExcelColumn(name="寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="寮�濮嬫椂闂�")
+ @ExcelColumn(name="寮�濮嬫椂闂�",index =4,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- @ExcelColumn(name="缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="缁撴潫鏃堕棿")
+ @ExcelColumn(name="缁撴潫鏃堕棿",index =5,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "棰勮鍑哄彂鏃堕棿")
- @ExcelColumn(name="棰勮鍑哄彂鏃堕棿")
+ //@ExcelColumn(name="棰勮鍑哄彂鏃堕棿")
+ @ExcelColumn(name="鍑哄彂鏃堕棿",index =7,width = 10)
private String planUseDate;
@ApiModelProperty(value = "鐘舵�� 0鐢宠涓� 1瀹℃牳涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃 4宸插彇娑�", example = "1")
- @ExcelColumn(name="鐘舵�� 0鐢宠涓� 1瀹℃牳涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃 4宸插彇娑�")
+ //@ExcelColumn(name="鐘舵�� 0鐢宠涓� 1瀹℃牳涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃 4宸插彇娑�")
+ @ExcelColumn(name="鐘舵��",index =10,width = 8,valueMapping = "0=鐢宠涓�;1=瀹℃牳涓�;2=瀹℃壒閫氳繃;3=瀹℃壒涓嶉�氳繃;4=宸叉挙閿�;")
private Integer status;
@ApiModelProperty(value = "瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
- @ExcelColumn(name="瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
private Date checkDate;
@ApiModelProperty(value = "瀹℃壒浜�(鏈�杩戜竴娆★級", example = "1")
- @ExcelColumn(name="瀹℃壒浜�(鏈�杩戜竴娆★級")
+ //@ExcelColumn(name="瀹℃壒浜�(鏈�杩戜竴娆★級")
private Integer checkUserId;
@ApiModelProperty(value = "瀹℃壒澶囨敞(鏈�杩戜竴娆★級")
- @ExcelColumn(name="瀹℃壒澶囨敞(鏈�杩戜竴娆★級")
+ //@ExcelColumn(name="瀹℃壒澶囨敞(鏈�杩戜竴娆★級")
private String checkInfo;
@ApiModelProperty(value = "鍙栨秷绫诲瀷 0鐢宠浜哄彇娑� 1娲捐溅鍛樻挙閿�")
- @ExcelColumn(name="鍙栨秷绫诲瀷 0鐢宠浜哄彇娑� 1娲捐溅鍛樻挙閿�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date cancelType;
+ //@ExcelColumn(name="鍙栨秷绫诲瀷 0鐢宠浜哄彇娑� 1娲捐溅鍛樻挙閿�")
+ private Integer cancelType;
@ApiModelProperty(value = "鏄惁宸插彇娑� 0鏈彇娑� 1宸插彇娑�")
- @ExcelColumn(name="鏄惁宸插彇娑� 0鏈彇娑� 1宸插彇娑�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date cancelStatus;
+ //@ExcelColumn(name="鏄惁宸插彇娑� 0鏈彇娑� 1宸插彇娑�")
+ private Integer cancelStatus;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="鍙栨秷鏃堕棿")
private Date cancelTime;
@ApiModelProperty(value = "鍙栨秷浜�", example = "1")
- @ExcelColumn(name="鍙栨秷浜�")
+ //@ExcelColumn(name="鍙栨秷浜�")
private Integer cancelUser;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
- @ExcelColumn(name="鍙栨秷澶囨敞")
+ //@ExcelColumn(name="鍙栨秷澶囨敞")
private String cancelInfo;
@ApiModelProperty(value = "鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅", example = "1")
- @ExcelColumn(name="鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅")
+ //@ExcelColumn(name="鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅")
+ @ExcelColumn(name="鐩殑鍦扮被鍨�",index =8,width = 5,valueMapping = "0=甯傚唴鐢ㄨ溅;1=甯傚鐢ㄨ溅")
private Integer type;
@ApiModelProperty(value = "涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
- @ExcelColumn(name="涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- private Integer memberIds;
+ //@ExcelColumn(name="涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String memberIds;
@ApiModelProperty(value = "涔樿溅浜哄鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- @ExcelColumn(name="涔樿溅浜哄鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ //@ExcelColumn(name="涔樿溅浜哄鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @ExcelColumn(name="涔樿溅浜�",index =6,width = 10)
private String memberNames;
@ApiModelProperty(value = "鐢ㄨ溅浜嬬敱")
- @ExcelColumn(name="鐢ㄨ溅浜嬬敱")
+ //@ExcelColumn(name="鐢ㄨ溅浜嬬敱")
private String content;
@ApiModelProperty(value = "鐩殑鍦�")
- @ExcelColumn(name="鐩殑鍦�")
+ //@ExcelColumn(name="鐩殑鍦�")
+ @ExcelColumn(name="鐩殑鍦�",index =9,width = 10)
private String addr;
@ApiModelProperty(value = "鐢宠浜虹紪鐮�(鍏宠仈member)", example = "1")
- @ExcelColumn(name="鐢宠浜虹紪鐮�(鍏宠仈member)")
+ //@ExcelColumn(name="鐢宠浜虹紪鐮�(鍏宠仈member)")
private Integer memberId;
- @ApiModelProperty(value = "鍙告満缂栫爜锛堝叧鑱攃ar_driver锛�", example = "1")
- @ExcelColumn(name="鍙告満缂栫爜锛堝叧鑱攃ar_driver锛�")
+ @ApiModelProperty(value = "鍙告満缂栫爜锛堝叧鑱攎emberId锛�", example = "1")
+ //@ExcelColumn(name="鍙告満缂栫爜锛堝叧鑱攎emberId锛�")
private Integer driverId;
- @ApiModelProperty(value = "鐢ㄨ溅浜哄憳", example = "1")
- @ExcelColumn(name="鐢ㄨ溅浜哄憳")
- private Integer memberNum;
+ @ApiModelProperty(value = "閽夐拤寰呭姙浠诲姟涓婚敭")
+ private String ddToDoId;
+
+ @ApiModelProperty(value = "閽夐拤寰呭姙浠诲姟褰掑睘浜轰富閿�")
+ private String ddBelongToUnionId;
+
+ @ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String driverName;
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ private String driverPhone;
+ @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎻愭姤浜�",index =2,width = 8)
+ private String memberName;
+ @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炵粍缁�",index =3,width = 20)
+ private String companyName;
+ @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1")
+ @TableField(exist = false)
+ private String memberPhone;
+ @ApiModelProperty(value = "涔樿溅浜洪泦鍚�", example = "1")
+ @TableField(exist = false)
+ private List<Member> memberList;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鍒涘缓鏃堕棿锛�", example = "2024-05-20 11:48:50")
+ @TableField(exist = false)
+ private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鍒涘缓鏃堕棿锛�", example = "2024-05-20 11:48:46")
+ @TableField(exist = false)
+ private Date queryEndTime;
+ @ApiModelProperty(value = "鏌ヨ鏃ユ湡", example = "2024-05-20" ,notes = "H5浣跨敤")
+ @TableField(exist = false)
+ private String queryDate;
+ @ApiModelProperty(value = "鐢宠浜虹數璇�")
+ @TableField(exist = false)
+ private String memberMobile;
+ @ApiModelProperty(value = "閫氱煡鎻忚堪")
+ @TableField(exist = false)
+ private String info;
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
+ @TableField(exist = false)
+ private ApproveDataVO approveDateVO;
+
+ @ApiModelProperty(value = "鏄惁鍏锋湁鎿嶄綔鏉冮檺(鎾ゅ洖锛�")
+ @TableField(exist = false)
+ private Integer hasRole ;
}
--
Gitblit v1.9.3