From 670272b077e2a741f66b5636b227b1e7777a976a Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 29 一月 2024 14:36:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
index faf27ba..77523c0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
@@ -1,7 +1,10 @@
package com.jcdm.main.da.passingStationCollection.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
@@ -13,6 +16,7 @@
* @author yyt
* @date 2023-12-12
*/
+@Data
public class DaPassingStationCollection extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -45,14 +49,20 @@
private String equipmentNo;
/** 鍏ョ珯鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍏ョ珯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ョ珯鏃堕棿")
private Date inboundTime;
/** 鍑虹珯鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍑虹珯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹珯鏃堕棿")
private Date outboundTime;
+
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
/** 鍏ョ珯鏄惁鍚堟牸 */
@Excel(name = "鍏ョ珯鏄惁鍚堟牸")
@@ -71,8 +81,8 @@
private String outMsgSign;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "閲囬泦鏃堕棿")
private Date collectionTime;
/** 棰勭暀瀛楁1 */
@@ -91,7 +101,20 @@
@Excel(name = "鑺傛媿鏃堕棿")
private String beatTime;
- public void setId(Long id)
+ @TableField(exist = false)
+ private Long beatTimeLong;
+
+ private Long[] ids;
+
+ public Long[] getIds() {
+ return ids;
+ }
+
+ public void setIds(Long[] ids) {
+ this.ids = ids;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
--
Gitblit v1.9.3