From 41570480eac58895b5b0fabe6ad9237444746de7 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 24 一月 2024 15:27:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index ad4499b..83eb39f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -1,9 +1,17 @@
 package com.jcdm.main.bs.orderScheduling.domain;
 
+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;
 import com.jcdm.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 璁㈠崟鎺掍骇瀵硅薄 bs_order_scheduling
@@ -11,6 +19,7 @@
  * @author jiang
  * @date 2024-01-13
  */
+@Data
 public class BsOrderScheduling extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -120,6 +129,91 @@
 
     private String endTime;
 
+    /** 鍚堢涓婄嚎鏃堕棿 */
+    @Excel(name = "鍚堢涓婄嚎鏃堕棿")
+    private Date boxClosingOnlineTime;
+
+    /** 鍚堢涓嬬嚎鏃堕棿 */
+    @Excel(name = "鍚堢涓嬬嚎鏃堕棿")
+    private Date closingBoxOfflineTime;
+
+    /** 鎬昏涓婄嚎鏃堕棿 */
+    @Excel(name = "鎬昏涓婄嚎鏃堕棿")
+    private Date finalAssemblyLaunchTime;
+
+    /** 鎬昏涓嬬嚎鏃堕棿 */
+    @Excel(name = "鎬昏涓嬬嚎鏃堕棿")
+    private Date finalAssemblyOfflineTime;
+
+    /** CVT涓婄嚎鏃堕棿 */
+    @Excel(name = "CVT涓婄嚎鏃堕棿")
+    private Date cvtLaunchTime;
+
+    /** CVT涓嬬嚎鏃堕棿 */
+    @Excel(name = "CVT涓嬬嚎鏃堕棿")
+    private Date cvtOfflineTime;
+
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startQuery;
+
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endQuery;
+
+    @TableField(exist = false)
+    private String queryField;
+
+    public Date getBoxClosingOnlineTime() {
+        return boxClosingOnlineTime;
+    }
+
+    public void setBoxClosingOnlineTime(Date boxClosingOnlineTime) {
+        this.boxClosingOnlineTime = boxClosingOnlineTime;
+    }
+
+    public Date getClosingBoxOfflineTime() {
+        return closingBoxOfflineTime;
+    }
+
+    public void setClosingBoxOfflineTime(Date closingBoxOfflineTime) {
+        this.closingBoxOfflineTime = closingBoxOfflineTime;
+    }
+
+    public Date getFinalAssemblyLaunchTime() {
+        return finalAssemblyLaunchTime;
+    }
+
+    public void setFinalAssemblyLaunchTime(Date finalAssemblyLaunchTime) {
+        this.finalAssemblyLaunchTime = finalAssemblyLaunchTime;
+    }
+
+    public Date getFinalAssemblyOfflineTime() {
+        return finalAssemblyOfflineTime;
+    }
+
+    public void setFinalAssemblyOfflineTime(Date finalAssemblyOfflineTime) {
+        this.finalAssemblyOfflineTime = finalAssemblyOfflineTime;
+    }
+
+    public Date getCvtLaunchTime() {
+        return cvtLaunchTime;
+    }
+
+    public void setCvtLaunchTime(Date cvtLaunchTime) {
+        this.cvtLaunchTime = cvtLaunchTime;
+    }
+
+    public Date getCvtOfflineTime() {
+        return cvtOfflineTime;
+    }
+
+    public void setCvtOfflineTime(Date cvtOfflineTime) {
+        this.cvtOfflineTime = cvtOfflineTime;
+    }
+
     public String[] getDateConditions() {
         return dateConditions;
     }

--
Gitblit v1.9.3