From 9ace046d1d38dea9f5a4a4970ecabadd3d1ff9bb Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 29 Apr 2021 19:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=AF=B9=E8=B1=A1=E5=85=B3?=
 =?UTF-8?q?=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java   | 23 ++++++++++++++++++----
 .../cn/estsh/i3plus/pojo/aps/holders/EWork.java    |  2 ++
 .../src/main/resources/relations/Work.xml          |  2 ++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 6aeff65..c29893b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -160,10 +160,13 @@ public class Work extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long mainPlanId;
 
-    @Column(name="DYN_SPLIT_WORK_ID")
-    @ApiParam(value ="动态拆分的工作ID")
-//    @FieldAnnotation(property = false)
-    private Long dynSplitWorkId;
+//    @Column(name="DYN_SPLIT_WORK_ID")
+//    @ApiParam(value ="动态拆分的工作ID")
+//    private Long dynSplitWorkId;
+
+    @Column(name="ORIGIN_WORK_ID")
+    @ApiParam(value ="动态拆分前工作ID")
+    private Long originWorkId;
 
     private transient boolean hasOptimized = false;
 
@@ -250,4 +253,16 @@ public class Work extends BaseAPS {
         }
         return getCount();
     }
+
+    @JsonBackReference
+    public List<Work> getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); }
+
+    public Work getOriginWork() {
+        return BeanRelation.get(this, EWork.OriginWork);
+    }
+
+    public void setOriginWork(Work work) {
+        this.originWorkId = work != null ? work.getId() : 0;
+        BeanRelation.set(this, EWork.OriginWork, work);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
index b9f6294..70d265e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
@@ -13,4 +13,6 @@ public enum EWork {
     MainPlan,    // 关联的为主资源的计划
     WorkPlans,   // 关联的工作计划
     SpecifyResource, // 指定资源
+    DynSplitWorks, // 动态拆分后的工作
+    OriginWork, // 动态拆分前的工作
 }
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
index 2942714..da892ce 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
@@ -20,4 +20,6 @@
     </Relation>
     <Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE">
     </Relation>
+    <Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
+    </Relation>
 </Class>
\ No newline at end of file