update...

潘钊
1 parent 9647744c
Showing 2 changed files with 14 additions and 3 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
@@ -384,9 +384,9 @@ public class DayOfSchedule implements CommandLineRunner {
                 }
                 sch.setJhlcOrig(sch.getJhlc());
-                //计划里程为0，设置NULL
-                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                //    sch.setJhlc(null);
+                //保留备注
+                if(StringUtils.isNotEmpty(sch.getRemark()))
+                    sch.setRemarks(sch.getRemark());
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -145,6 +145,9 @@ public class ScheduleRealInfo {
 	/** 备注*/
 	private String remarks;
+
+	/** 原计划排班备注 */
+	private String remark;
 	/**待发时间（格式 HH:mm） */
 	private String dfsj;
@@ -875,4 +878,12 @@ public class ScheduleRealInfo {
 		else
 			this.setLate(false);
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 }