优化资源评估中间计算结果。

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java

@@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS {
     private static final long serialVersionUID = -1869359887027950540L;
 
     @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
+    @ApiParam(value ="工作编码")
     @FieldAnnotation(relation = "Work")
     private Long workId;
 
@@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS {
     }
 
     @JsonBackReference
-    public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
+    public List<InterMediateDetail> getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWork;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
@@ -265,4 +266,7 @@ public class Work extends BaseAPS {
         this.originWorkId = work != null ? work.getId() : 0;
         BeanRelation.set(this, EWork.OriginWork, work);
     }
+
+    @JsonBackReference
+    public List<InterMediateResult> getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -19,6 +19,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作计划

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java

@@ -15,4 +15,5 @@ public enum EWork {
     SpecifyResource, // 指定资源
     DynSplitWorks, // 动态拆分后的工作
     OriginWork, // 动态拆分前的工作
+    EvaluateResult, // 资源评估结果
 }

modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="InterMediateResult">
-    <Relation field="Work" name="Work" type="MULTI_TO_ONE">
-    </Relation>
     <Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
     </Relation>
     <Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">

modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml

@@ -22,4 +22,6 @@
     </Relation>
     <Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
     </Relation>
+    <Relation field="EvaluateResult" name="InterMediateResult" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
 </Class>