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 1ab6cb3..74c48cd 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 @@ -184,6 +184,11 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long mouldId = 0L; + @Column(name="FEEDBACK_SPLIT") + @ApiParam(value ="是否报工拆分") + @FieldAnnotation(modify = false) + private Boolean feedbackSplit; + // 排程时,找插入位置的评估值 private transient double evaluateValue = 0; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 0223427..b09259b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -27,6 +27,7 @@ public class GanttPlanModel { private Date endDate; private String cls; private String eventColor; + private String style; private String name; private Long workId; private List resIds;