From d23d253c12006b66a503bbbc34a30b7d0f52a75a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 16 八月 2024 18:26:33 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java index 7df6ac4..b5a6f17 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,7 +33,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -41,7 +42,7 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -90,7 +91,7 @@ @ApiModelProperty(value = "绛惧埌鏃堕棿") @ExcelColumn(name="绛惧埌鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date signDate; @ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1") @@ -115,7 +116,7 @@ @ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鏃堕棿") @ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date inwaitDate; @ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鎿嶄綔浜虹紪鐮�", example = "1") @@ -124,7 +125,7 @@ @ApiModelProperty(value = "鍙彿鏃堕棿") @ExcelColumn(name="鍙彿鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date callDate; @ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1") @@ -137,17 +138,17 @@ @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�") @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; @ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級") @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date doneDate; @ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿") @ExcelColumn(name="寮傚父鎸傝捣鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date errorDate; @ApiModelProperty(value = "寮傚父鎸傝捣浜虹紪鐮�", example = "1") @@ -160,7 +161,7 @@ @ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿") @ExcelColumn(name="鏈堝彴杞氦鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date transPlatformDate; @ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1") @@ -173,12 +174,11 @@ @ApiModelProperty(value = "杞﹁締杩涘巶鏃堕棿") @ExcelColumn(name="杞﹁締杩涘巶鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date inDate; @ApiModelProperty(value = "杞﹁締绂诲巶鏃堕棿") @ExcelColumn(name="杞﹁締绂诲巶鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date outDate; @ApiModelProperty(value = "绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満", example = "1") @@ -191,7 +191,7 @@ @ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂鏃堕棿") @ExcelColumn(name="杞﹁締绂诲巶涓嬪彂鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date outHkdate; @ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂澶囨敞") @@ -208,7 +208,7 @@ @ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿") @ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date inHkdate; @ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1") @@ -233,7 +233,7 @@ @ApiModelProperty(value = "浣滃簾鏃堕棿") @ExcelColumn(name="浣滃簾鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date cancelDate; @ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1") @@ -254,7 +254,6 @@ @ApiModelProperty(value = "棰勮鍒板満鏃堕棿") @ExcelColumn(name="棰勮鍒板満鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date arriveDate; @ApiModelProperty(value = "鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫", example = "1") @@ -265,4 +264,20 @@ @ExcelColumn(name="鎬昏繍杈撻噺") private BigDecimal totalNum; + @ApiModelProperty(value = "鍓嶆柟鎺掗槦鏁伴噺", example = "1") + @TableField(exist = false) + private Long lineUpNum; + + @ApiModelProperty(value = "鍏宠仈鏈堝彴缁勭紪鐮侊紙鍏宠仈platform_group琛級", example = "1") + @TableField(exist = false) + private Integer groupId; + + @ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О") + @TableField(exist = false) + private String platformName ; + + @ApiModelProperty(value = "璺濈绛惧埌鐐硅窛绂�") + @TableField(exist = false) + private BigDecimal getDistance; + } -- Gitblit v1.9.3