From bec1e27df1cce02f0a4b9aa19a2fc50f4551fb64 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期日, 27 四月 2025 15:00:28 +0800
Subject: [PATCH] 【UPDATE】1.新增或修改日历数据时验证有效日期和失效日期是否重叠 2.增加日历视图页面接口

---
 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
index e4d09d2..17a9c4b 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
@@ -122,10 +122,9 @@
     @Excel(name = "鍒犻櫎鏍囧織", readConverterExp = "0=浠h〃瀛樺湪,2=浠h〃鍒犻櫎")
     private String delFlag;
 
-
-
-
-
+    /** 浣滀笟 */
+    @Excel(name = "浣滀笟")
+    private String stdOp;
 
     private String orgCode;
 
@@ -406,6 +405,14 @@
         this.orgCode = orgCode;
     }
 
+    public void setStdOp(String stdOp) {
+        this.stdOp = stdOp;
+    }
+
+    public String getStdOp() {
+        return stdOp;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -440,6 +447,7 @@
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("processStatus", getProcessStatus())
+            .append("stdOp", getStdOp())
             .toString();
     }
 }

--
Gitblit v1.9.3