From d6aa8bb0f1915f7d4908cdac92c4483c8711647b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 30 八月 2024 18:08:57 +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/PlatformBooks.java | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
index 482fbd7..12e06bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
@@ -1,6 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -56,7 +59,7 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃 4宸插彇娑�", example = "1")
@ExcelColumn(name="鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃")
private Integer status;
@@ -99,6 +102,67 @@
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
@ExcelColumn(name="鍙告満鎵嬫満鍙�")
- private String drivierPhone;
+ private String driverPhone;
+
+ @ApiModelProperty(value = "鍑嗚繍璇佺収鐗�")
+ @ExcelColumn(name="鍑嗚繍璇佺収鐗�")
+ private String transportImg;
+
+ @ApiModelProperty(value = "鍏ュ洯鍘熷洜")
+ @ExcelColumn(name="鍏ュ洯鍘熷洜")
+ private String inReason;
+
+ @ApiModelProperty(value = "鍏ュ洯鍘熷洜涓婚敭")
+ @ExcelColumn(name="鍏ュ洯鍘熷洜涓婚敭")
+ private Integer reasonId;
+
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
+ @ExcelColumn(name="鍙栨秷鏃堕棿")
+ private Date cancelTime;
+
+ @ApiModelProperty(value = "鍙栨秷浜�")
+ @ExcelColumn(name="鍙栨秷浜�")
+ private Integer cancelUser;
+
+ @ApiModelProperty(value = "鍙栨秷澶囨敞")
+ @ExcelColumn(name="鍙栨秷澶囨敞")
+ private String cancelInfo;
+
+ @ApiModelProperty(value = "鐢熸垚浠诲姟涓婚敭 platform_job:id")
+ @ExcelColumn(name="鍏ュ洯鍘熷洜涓婚敭")
+ private Integer jobId;
+
+ @ApiModelProperty(value = "鏌ヨ鏃ユ湡 鐢ㄦ埛寰俊绔煡璇�")
+ @TableField(exist = false)
+ private String queryDate;
+
+ @ApiModelProperty(value = "鍥剧墖鍓嶇紑")
+ @TableField(exist = false)
+ private String prefixUrl;
+
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
+ @TableField(exist = false)
+ private ApproveDataVO approveDateVO;
+
+ public PlatformJob toPlatformJob(){
+ PlatformJob platformJob = new PlatformJob();
+ platformJob.setCreateDate(new Date());
+ platformJob.setIsdeleted(Constants.ZERO);
+ platformJob.setStatus(Constants.ZERO);
+ platformJob.setDriverId(this.getDriverId());
+ platformJob.setDriverName(this.getDriverName());
+ platformJob.setDrivierPhone(this.getDriverPhone());
+ platformJob.setCarCodeBack(this.getCarCodeBack());
+ platformJob.setCarCodeFront(this.getCarCodeFront());
+ platformJob.setContractNum(this.getContractNum());
+ platformJob.setReason(this.getInReason());
+ platformJob.setArriveDate(this.getArriveDate());
+ platformJob.setInType(this.getInType());
+ platformJob.setTotalNum(this.getTotalNum());
+ return platformJob;
+ }
+
+
+
}
--
Gitblit v1.9.3