潘钊 / bsth_control · Commits

Commit 1b27857c3e54d901e056aef8cfa40eeecf25e70c

Authored by 徐烜
1 parent 3d20e8d6

update

Inline Side-by-side
Showing 1 changed file with 14 additions and 13 deletions
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
  View file @1b27857
@@ -17,12 +17,12 @@ public class ScheduleRule_input { @@ -17,12 +17,12 @@ public class ScheduleRule_input {
17 private DateTime qyrq; 17 private DateTime qyrq;
18 18
19 /** 路牌范围 */ 19 /** 路牌范围 */
20 - private List<Long> guideboardIds = new ArrayList<>(); 20 + private List<String> guideboardIds = new ArrayList<>();
21 /** 起始路牌下标 */ 21 /** 起始路牌下标 */
22 private int startGbdIndex; 22 private int startGbdIndex;
23 23
24 /** 人员范围 */ 24 /** 人员范围 */
25 - private List<Long> employeeConfigIds = new ArrayList<>(); 25 + private List<String> employeeConfigIds = new ArrayList<>();
26 /** 起始人员下标 */ 26 /** 起始人员下标 */
27 private int startEIndex; 27 private int startEIndex;
28 28
@@ -37,21 +37,22 @@ public class ScheduleRule_input { @@ -37,21 +37,22 @@ public class ScheduleRule_input {
37 this.ruleId = scheduleRule1Flat.getId(); 37 this.ruleId = scheduleRule1Flat.getId();
38 this.qyrq = new DateTime(scheduleRule1Flat.getQyrq()); 38 this.qyrq = new DateTime(scheduleRule1Flat.getQyrq());
39 List<String> lpIds = Splitter.on(",").splitToList(scheduleRule1Flat.getLpIds()); 39 List<String> lpIds = Splitter.on(",").splitToList(scheduleRule1Flat.getLpIds());
40 - for (String lpId : lpIds) {  
41 - this.guideboardIds.add(Long.parseLong(lpId));  
42 - } 40 +// for (String lpId : lpIds) {
  41 +// this.guideboardIds.add(Long.parseLong(lpId));
  42 +// }
  43 + guideboardIds.addAll(lpIds);
43 // 路牌初始下标减1 44 // 路牌初始下标减1
44 this.startGbdIndex = scheduleRule1Flat.getLpStart() - 1; 45 this.startGbdIndex = scheduleRule1Flat.getLpStart() - 1;
45 List<String> ryCids = Splitter.on(",").splitToList(scheduleRule1Flat.getRyConfigIds()); 46 List<String> ryCids = Splitter.on(",").splitToList(scheduleRule1Flat.getRyConfigIds());
46 - for (String ryCid : ryCids) {  
47 - this.employeeConfigIds.add(Long.parseLong(ryCid));  
48 - } 47 +// for (String ryCid : ryCids) {
  48 +// this.employeeConfigIds.add(Long.parseLong(ryCid));
  49 +// }
  50 + employeeConfigIds.addAll(ryCids);
49 // 人员初始索引减1 51 // 人员初始索引减1
50 this.startEIndex = scheduleRule1Flat.getRyStart() - 1; 52 this.startEIndex = scheduleRule1Flat.getRyStart() - 1;
51 this.carConfigId = scheduleRule1Flat.getCarConfigInfo().getId(); 53 this.carConfigId = scheduleRule1Flat.getCarConfigInfo().getId();
52 } 54 }
53 55
54 -  
55 public Long getRuleId() { 56 public Long getRuleId() {
56 return ruleId; 57 return ruleId;
57 } 58 }
@@ -68,11 +69,11 @@ public class ScheduleRule_input { @@ -68,11 +69,11 @@ public class ScheduleRule_input {
68 this.qyrq = qyrq; 69 this.qyrq = qyrq;
69 } 70 }
70 71
71 - public List<Long> getGuideboardIds() { 72 + public List<String> getGuideboardIds() {
72 return guideboardIds; 73 return guideboardIds;
73 } 74 }
74 75
75 - public void setGuideboardIds(List<Long> guideboardIds) { 76 + public void setGuideboardIds(List<String> guideboardIds) {
76 this.guideboardIds = guideboardIds; 77 this.guideboardIds = guideboardIds;
77 } 78 }
78 79
@@ -84,11 +85,11 @@ public class ScheduleRule_input { @@ -84,11 +85,11 @@ public class ScheduleRule_input {
84 this.startGbdIndex = startGbdIndex; 85 this.startGbdIndex = startGbdIndex;
85 } 86 }
86 87
87 - public List<Long> getEmployeeConfigIds() { 88 + public List<String> getEmployeeConfigIds() {
88 return employeeConfigIds; 89 return employeeConfigIds;
89 } 90 }
90 91
91 - public void setEmployeeConfigIds(List<Long> employeeConfigIds) { 92 + public void setEmployeeConfigIds(List<String> employeeConfigIds) {
92 this.employeeConfigIds = employeeConfigIds; 93 this.employeeConfigIds = employeeConfigIds;
93 } 94 }
94 95