Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

娄高锋
2 parents d5503be9 72cae779
Showing 1 changed file with 4 additions and 2 deletions
src/main/resources/rules/shiftloop_fb_2.drl
@@ -148,7 +148,8 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
             $self: schedulePlan
         )
         eval($self.getIsHistoryPlanFirst() == true) // 是否使用历史排班标识
-        $sprr: SchedulePlanRuleResult($qyrq: qyrq) from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
+        $sprr: SchedulePlanRuleResult() from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
+        eval($sprr.getQyrq() != null)
  
     then
         // 创建班序历史结果数据
@@ -159,7 +160,7 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
  
         // 规则Md5编码
         String md5 = Md5Util.getMd5(
-            String.valueOf($qyrq.getTime()) + "_" +
+            String.valueOf($sprr.getQyrq().getTime()) + "_" +
             $sprr.getGids() + "_" + $sprr.getEcids()
         );
  
@@ -325,6 +326,7 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setScheduleDate($csd2.toDate());
         schedulePlanRuleResult.setTtinfoId($ttinfoId);
         schedulePlanRuleResult.setTtinfoName($ttinfoName);
+        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate());
  
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);