Commit d61b80adde04e4a96bf246a29047e7ba6b10e61b

Authored by 徐烜
1 parent 96e303f1

Update

src/main/resources/rules/shiftloop_fb_2.drl
... ... @@ -148,7 +148,8 @@ rule "Calcu_SchedulePlanRuleResult_wrap"
148 148 $self: schedulePlan
149 149 )
150 150 eval($self.getIsHistoryPlanFirst() == true) // 是否使用历史排班标识
151   - $sprr: SchedulePlanRuleResult($qyrq: qyrq) from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
  151 + $sprr: SchedulePlanRuleResult() from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
  152 + eval($sprr.getQyrq() != null)
152 153  
153 154 then
154 155 // 创建班序历史结果数据
... ... @@ -159,7 +160,7 @@ rule "Calcu_SchedulePlanRuleResult_wrap"
159 160  
160 161 // 规则Md5编码
161 162 String md5 = Md5Util.getMd5(
162   - String.valueOf($qyrq.getTime()) + "_" +
  163 + String.valueOf($sprr.getQyrq().getTime()) + "_" +
163 164 $sprr.getGids() + "_" + $sprr.getEcids()
164 165 );
165 166  
... ... @@ -325,6 +326,7 @@ rule "Calcu_loop2_1_" // 路牌在时刻表中存在,就翻
325 326 schedulePlanRuleResult.setScheduleDate($csd2.toDate());
326 327 schedulePlanRuleResult.setTtinfoId($ttinfoId);
327 328 schedulePlanRuleResult.setTtinfoName($ttinfoName);
  329 + schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate());
328 330  
329 331 scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
330 332  
... ...