Commit 11aba068db6ba28991aabcb355d9ae1ce74439d1

Authored by 潘钊
1 parent 1752b835

update

src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
@@ -2,13 +2,11 @@ package com.bsth.entity.realcontrol; @@ -2,13 +2,11 @@ package com.bsth.entity.realcontrol;
2 2
3 import com.bsth.entity.sys.SysUser; 3 import com.bsth.entity.sys.SysUser;
4 import com.fasterxml.jackson.annotation.JsonIgnore; 4 import com.fasterxml.jackson.annotation.JsonIgnore;
5 -  
6 -import javax.persistence.*;  
7 -  
8 import org.apache.commons.lang3.StringUtils; 5 import org.apache.commons.lang3.StringUtils;
9 import org.joda.time.format.DateTimeFormat; 6 import org.joda.time.format.DateTimeFormat;
10 import org.joda.time.format.DateTimeFormatter; 7 import org.joda.time.format.DateTimeFormatter;
11 8
  9 +import javax.persistence.*;
12 import java.util.Date; 10 import java.util.Date;
13 import java.util.HashSet; 11 import java.util.HashSet;
14 import java.util.Set; 12 import java.util.Set;
@@ -177,8 +175,95 @@ public class ScheduleRealInfo { @@ -177,8 +175,95 @@ public class ScheduleRealInfo {
177 /** 子任务 */ 175 /** 子任务 */
178 @OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/) 176 @OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/)
179 private Set<ChildTaskPlan> cTasks = new HashSet<>(); 177 private Set<ChildTaskPlan> cTasks = new HashSet<>();
180 -  
181 - /** ---------------- 178 +
  179 + /** 关联的公司名称 */
  180 + private String gsName;
  181 + /** 关联的公司编码 */
  182 + private String gsBm;
  183 + /** 关联的分公司名称 */
  184 + private String fgsName;
  185 + /** 关联的分公司编码 */
  186 + private String fgsBm;
  187 + /** 出场顺序号 */
  188 + private Integer ccno;
  189 +
  190 + public String getQdzArrDatejh() {
  191 + return qdzArrDatejh;
  192 + }
  193 +
  194 + public void setQdzArrDatejh(String qdzArrDatejh) {
  195 + this.qdzArrDatejh = qdzArrDatejh;
  196 + }
  197 +
  198 + public String getQdzArrDatesj() {
  199 + return qdzArrDatesj;
  200 + }
  201 +
  202 + public void setQdzArrDatesj(String qdzArrDatesj) {
  203 + this.qdzArrDatesj = qdzArrDatesj;
  204 + }
  205 +
  206 + public void setcTasks(Set<ChildTaskPlan> cTasks) {
  207 + this.cTasks = cTasks;
  208 + }
  209 +
  210 + public String getGsName() {
  211 + return gsName;
  212 + }
  213 +
  214 + public void setGsName(String gsName) {
  215 + this.gsName = gsName;
  216 + }
  217 +
  218 + public String getGsBm() {
  219 + return gsBm;
  220 + }
  221 +
  222 + public void setGsBm(String gsBm) {
  223 + this.gsBm = gsBm;
  224 + }
  225 +
  226 + public String getFgsName() {
  227 + return fgsName;
  228 + }
  229 +
  230 + public void setFgsName(String fgsName) {
  231 + this.fgsName = fgsName;
  232 + }
  233 +
  234 + public String getFgsBm() {
  235 + return fgsBm;
  236 + }
  237 +
  238 + public void setFgsBm(String fgsBm) {
  239 + this.fgsBm = fgsBm;
  240 + }
  241 +
  242 + public Integer getCcno() {
  243 + return ccno;
  244 + }
  245 +
  246 + public void setCcno(Integer ccno) {
  247 + this.ccno = ccno;
  248 + }
  249 +
  250 + public static DateTimeFormatter getFmtHHmm() {
  251 + return fmtHHmm;
  252 + }
  253 +
  254 + public static void setFmtHHmm(DateTimeFormatter fmtHHmm) {
  255 + ScheduleRealInfo.fmtHHmm = fmtHHmm;
  256 + }
  257 +
  258 + public static DateTimeFormatter getFmtyyyyMMddHHmm() {
  259 + return fmtyyyyMMddHHmm;
  260 + }
  261 +
  262 + public static void setFmtyyyyMMddHHmm(DateTimeFormatter fmtyyyyMMddHHmm) {
  263 + ScheduleRealInfo.fmtyyyyMMddHHmm = fmtyyyyMMddHHmm;
  264 + }
  265 +
  266 + /** ----------------
182 @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) 267 @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
183 private RealTimeModel sjfcModel; 268 private RealTimeModel sjfcModel;
184 @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) 269 @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)