From 25cc1b887f5421353d94c5e6be0fca56b3f2e668 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 21 五月 2025 16:29:24 +0800
Subject: [PATCH] 优化Job

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
index 2138c12..43ea498 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -96,13 +96,13 @@
     private String department;
 
     /** 璁″垝寮�宸ユ棩 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date planStartDay;
 
     /** 璁″垝瀹屽伐鏃� */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date planEndDay;
 
     /** 澶囨枡鏂欏彿 */
@@ -161,6 +161,92 @@
     /** 椋庨櫓鏍囪瘑 */
     @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "褰撳墠宸ュ簭鍚嶇О")
+    private String stdOp;
+
+    /** 宸ュ崟鍒涘缓鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date orderCreateTime;
+
+    /** 宸ュ崟瀹℃牳鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date approveOn;
+
+    /** 宸ュ崟寮�宸ユ椂闂� */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startWorkDate;
+
+    /** 浣庨樁鐮�*/
+    private String lowOrderCode;
+
+    public Date getOrderCreateTime() {
+        return orderCreateTime;
+    }
+
+    public void setOrderCreateTime(Date orderCreateTime) {
+        this.orderCreateTime = orderCreateTime;
+    }
+
+    public Date getApproveOn() {
+        return approveOn;
+    }
+
+    public void setApproveOn(Date approveOn) {
+        this.approveOn = approveOn;
+    }
+
+    public Date getStartWorkDate() {
+        return startWorkDate;
+    }
+
+    public void setStartWorkDate(Date startWorkDate) {
+        this.startWorkDate = startWorkDate;
+    }
+
+    public String getLowOrderCode() {
+        return lowOrderCode;
+    }
+
+    public void setLowOrderCode(String lowOrderCode) {
+        this.lowOrderCode = lowOrderCode;
+    }
+
+    public String getStdOp() {
+        return stdOp;
+    }
+
+    public void setStdOp(String stdOp) {
+        this.stdOp = stdOp;
+    }
+
+    public String getOpStatus() {
+        return opStatus;
+    }
+
+    public void setOpStatus(String opStatus) {
+        this.opStatus = opStatus;
+    }
+
+    public String getNextOpName() {
+        return nextOpName;
+    }
+
+    public void setNextOpName(String nextOpName) {
+        this.nextOpName = nextOpName;
+    }
 
     public String getPlanType() {
         return planType;
@@ -571,6 +657,8 @@
                 .append("isStockComplete", getIsStockComplete())
                 .append("hasTurnback", getHasTurnback())
                 .append("hasRisk", getHasRisk())
+                .append("opStatus", getOpStatus())
+                .append("nextOpName", getNextOpName())
                 .toString();
     }
 }

--
Gitblit v1.9.3