Merge branch 'minhang' into pudong

徐烜
2 parents a6933c8a 36a2af96
Showing 6 changed files with 506 additions and 33 deletions
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleResults_output.java
src/main/resources/rules/legacy/shiftloop_fb_2.drl
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
@@ -48,6 +48,7 @@ public class ScheduleResults_output {
             groupRuleIdGuideBoardMap.get(s.getRuleId()).add(s);
         }
+        stringBuilder.append("\n");
         for (String ruleId : groupRuleIdGuideBoardMap.keySet()) {
             Collections.sort(groupRuleIdGuideBoardMap.get(ruleId), new Comparator<ScheduleResult_output>() {
                 @Override
+package com.bsth.service.schedule.shiftloop;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+
+import com.bsth.service.schedule.utils.Md5Util;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+
+import com.bsth.service.schedule.rules.ScheduleRuleService;
+
+import org.slf4j.Logger;
+
+global Logger log;
+global ScheduleResults_output scheduleResult;
+global ScheduleRuleService scheduleRuleService;
+
+/*
+    存在（翻班格式）
+*/
+
+//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
+
+declare Calcu_days_result_pre
+    ruleId: String // 规则Id
+    ruleMd5: String // 规则md5
+    ruleEcCount: Integer // 人员范围个数
+
+    calcu_index_lp : Integer // 计算之后路牌的起始索引
+    calcu_index_ry : Integer // 计算之后人员的起始索引
+
+    // 1、第一部分循环需要用到的数据（当开始日期大于启用日期的时候才有）
+    calcu_start_date_1: DateTime // 第一部分开始计算日期
+    calcu_end_date_1: DateTime // 第一部分结束计算日期
+
+    // 2、第二部分循环需要用到的数据
+    sdays : Integer // 总共需要排班的天数
+    calcu_start_date_2 : DateTime // 开始计算日期
+    calcu_end_date_2 : DateTime // 结束计算日期
+
+end
+
+/*
+    计算启用日期，开始计算日期，结束计算日期，相差天数
+    1、规则启用日期小于开始计算日期
+    2、规则启用日期大于等于开始日期，小于等于结束日期
+*/
+// 1、启用日期 < 开始日期
+rule "calcu_days_1_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $sri: ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval($qyrq.isBefore($fromDate))
+    then
+        scheduleResult.setXlid($xlId);
+
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($fromDate);
+        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($fromDate);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        /**
+         * 规则md5值（不使用id判定，使用md5判定）
+         * 使用，启用日期，路牌范围，结合生成md5编码
+         */
+        String ruleMd5 = Md5Util.getMd5(
+            String.valueOf($qyrq.getMillis()) +
+            "_" +
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
+        );
+        cdrp.setRuleMd5(ruleMd5);
+        // 人员范围个数
+        cdrp.setRuleEcCount($sri.getEmployeeConfigIds().size());
+
+        insert(cdrp);
+
+//        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $fromDate, $toDate);
+
+end
+
+// 启用日期 属于 [开始日期，结束日期]
+rule "calcu_days_2_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $sri: ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
+    then
+        scheduleResult.setXlid($xlId);
+
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($qyrq);
+        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($qyrq);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        /**
+         * 规则md5值（不使用id判定，使用md5判定）
+         * 使用，启用日期，路牌范围，结合生成md5编码
+         */
+        String ruleMd5 = Md5Util.getMd5(
+            String.valueOf($qyrq.getMillis()) +
+            "_" +
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
+        );
+        cdrp.setRuleMd5(ruleMd5);
+        // 人员范围个数
+        cdrp.setRuleEcCount($sri.getEmployeeConfigIds().size());
+
+        insert(cdrp);
+
+//        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $qyrq, $toDate);
+
+end
+
+// 使用已经排过班的数据修正Calcu_days_result_pre
+// 1、避免每次从规则的启用日期开始算
+// 2、时刻表会不停的修正，如果每次都从规则启用日期开始算，会出错
+
+declare SchedulePlanRuleResult_wrap
+    ruleId: String // 规则Id
+    ruleMd5: String // 规则md5编码
+    scheduleDate: DateTime // 排班日期
+
+    isUsed: Boolean = false // 是否被使用过
+
+    self: SchedulePlanRuleResult; // 原始对象数据
+end
+
+rule "Calcu_SchedulePlanRuleResult_wrap"
+    salience 950
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId,
+            $self: schedulePlan
+        )
+        eval($self.getIsHistoryPlanFirst() == true) // 是否使用历史排班标识
+        $sprr: SchedulePlanRuleResult() from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
+        eval($sprr.getQyrq() != null)
+
+    then
+        // 创建班序历史结果数据
+        SchedulePlanRuleResult_wrap schedulePlanRuleResult_wrap = new SchedulePlanRuleResult_wrap();
+        schedulePlanRuleResult_wrap.setRuleId($sprr.getRuleId());
+        schedulePlanRuleResult_wrap.setScheduleDate(new DateTime($sprr.getScheduleDate()));
+        schedulePlanRuleResult_wrap.setSelf($sprr);
+
+        // 规则Md5编码
+        String md5 = Md5Util.getMd5(
+            String.valueOf($sprr.getQyrq().getTime()) +
+            "_" +
+            $sprr.getGids() +
+            "_" +
+            $sprr.getOrigingidindex()
+        );
+
+//        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
+
+        schedulePlanRuleResult_wrap.setRuleMd5(md5);
+
+        insert(schedulePlanRuleResult_wrap);
+end
+
+
+// 1、启用日期 < 开始日期
+// 2、如果最近的排班规则历史时间在 (启用日期，开始日期) 之间，需要重新修正预处理数据
+rule "calcu_days_1_with_result"
+    no-loop
+    salience 960
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_start_date_2),
+            $ruleId: ruleId,
+            $ruleMd5: ruleMd5,
+            $ruleEcCount: ruleEcCount
+        )
+        $srrr_wrap: SchedulePlanRuleResult_wrap(
+//            ruleId == $ruleId,
+            ruleMd5 == $ruleMd5,
+            scheduleDate.isAfter($cdrp.calcu_start_date_1),
+            scheduleDate.isBefore($cdrp.calcu_start_date_2),
+            isUsed == false,
+            $scheduleDate: scheduleDate,
+            $self: self
+        )
+    then
+        // 修正排班数据
+//        log.info("准备修正 ruleId={} historyDate={}", $ruleId, $scheduleDate);
+
+        // 路牌范围起始index使用历史数据
+        $cdrp.setCalcu_index_lp(Integer.valueOf($self.getGidindex()));
+        // 人员范围起始index，需要判定，如果长度都是一样的，使用历史的，否则不更新，使用最新的
+        String history_ecids = $self.getEcids();
+        if ($ruleEcCount == history_ecids.split(",").length) {
+            $cdrp.setCalcu_index_ry(Integer.valueOf($self.getEcindex()));
+        }
+
+        $cdrp.setCalcu_start_date_1($scheduleDate);
+        update($cdrp);
+
+        $srrr_wrap.setIsUsed(true);
+        update($srrr_wrap);
+
+end
+
+
+
+//------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
+rule "Calcu_loop1_1_" // 路牌在时刻表中存在，就翻
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $gids: guideboardIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size()
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd1),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId
+        )
+    then
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+//        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+rule "Calcu_loop1_2_" // 路牌在时刻表中不存在，就不翻
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $rangesize : guideboardIds.size()
+        )
+    then
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+//        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+//------------------------- 第三阶段、计算规则准备数据2（第二组循环） ----------------------------//
+rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
+    salience 800
+    when
+        ScheduleCalcuParam_input($sp: schedulePlan, $xlid: xlId)
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isEqual(calcu_end_date_1),
+            calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size(),
+            $srf: self
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd2),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId,
+            $ttinfoId: ttInfoId,
+            $ttinfoName: ttInfoName
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+        ro.setXlId($xlid);
+
+        // 类型
+        ro.setsType($sri.getsType());
+
+        scheduleResult.getResults().add(ro);
+
+//        log.info("gogoogogogogo");
+
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+        if ($sri.getsType() == ScheduleRule_Type.NORMAL) {
+            // 保存排班规则循环结果 --> SchedulePlanRuleResult
+            SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+//        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
+            schedulePlanRuleResult.setXlId($srf.getXl().getId());
+            schedulePlanRuleResult.setXlName($srf.getXl().getName());
+            schedulePlanRuleResult.setRuleId($ruleId);
+            schedulePlanRuleResult.setCcId($cid);
+            schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+            schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
+            schedulePlanRuleResult.setGnames($srf.getLpNames());
+            schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+            schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+            schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+            schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+            schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+            schedulePlanRuleResult.setTtinfoId($ttinfoId);
+            schedulePlanRuleResult.setTtinfoName($ttinfoName);
+            schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
+            schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
+
+            scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+        }
+
+
+
+//        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
+    salience 800
+    when
+        ScheduleCalcuParam_input($sp: schedulePlan, $xlid: xlId)
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isEqual(calcu_end_date_1),
+            calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds,
+            $srf: self
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+        ro.setXlId($xlid);
+
+        // 类型
+        ro.setsType($sri.getsType());
+
+        scheduleResult.getResults().add(ro);
+
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+//        // 保存排班规则循环结果 --> SchedulePlanRuleResult
+//        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+//        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
+//        schedulePlanRuleResult.setXlName($srf.getXl().getName());
+//        schedulePlanRuleResult.setRuleId($ruleId);
+//        schedulePlanRuleResult.setCcId($cid);
+//        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+//        schedulePlanRuleResult.setGids($srf.getLpIds());
+//        schedulePlanRuleResult.setGnames($srf.getLpNames());
+//        schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+//        schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+//        schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+//        schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+//        schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+//
+//        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+
+//        log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+
+
+
+
+
@@ -254,6 +254,10 @@ rule &quot;calcu_days_1_with_result&quot;
             $cdrp.setCalcu_index_ry(Integer.valueOf($self.getEcindex()));
         }
+        // 翻班格式利用路牌的历史index更新
+        int fb_temp = Integer.valueOf($self.getGidindex()) % $cdrp.getFbweeks().size();
+        $cdrp.setFbgs_index(fb_temp);
+
         $cdrp.setCalcu_start_date_1($scheduleDate);
         update($cdrp);
@@ -266,7 +270,7 @@ end
 //------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
-function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri) {
+function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri, Logger log) {
     Integer $lpindex = $cdrp.getCalcu_index_lp();
     Integer $lprangesize = $sri.getGuideboardIds().size();
     Integer $ryindex = $cdrp.getCalcu_index_ry();
@@ -274,6 +278,8 @@ function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sr
     Integer $fbindex = $cdrp.getFbgs_index();
     Integer $fbfangesize = $sri.getWeekdays().size();
     DateTime $csd1 = $cdrp.getCalcu_start_date_1();
+    DateTime $ced1 = $cdrp.getCalcu_end_date_1();
+
     String $ruleId = $cdrp.getRuleId();
     $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
@@ -282,19 +288,21 @@ function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sr
     $cdrp.setFbgs_index(($fbindex + 1) % $fbfangesize);
     $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-//    log.info("calcu_loop1_fb ruleId={}, calcu_index_lp/ry={}/{}",
-//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+//    log.info("calcu_loop1_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd1, $ced1);
+
 }
-function void calcu_loop1_not_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri) {
+function void calcu_loop1_not_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri, Logger log) {
     DateTime $csd1 = $cdrp.getCalcu_start_date_1();
+    DateTime $ced1 = $cdrp.getCalcu_end_date_1();
     Integer $fbindex = $cdrp.getFbgs_index();
     Integer $fbfangesize = $sri.getWeekdays().size();
     $cdrp.setFbgs_index(($fbindex + 1) % $fbfangesize);
     $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-//    log.info("calcu_loop1_not_fb ruleId={}, calcu_index_lp/ry={}/{}",
-//        $cdrp.getRuleId(), $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+//    log.info("calcu_loop1_not_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $cdrp.getRuleId(), $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd1, $ced1);
 }
@@ -312,7 +320,7 @@ rule &quot;Calcu_loop1_fbtype_with_0_&quot; // 翻班模式为 type=1 使用翻班格式
             weekdays[$fbindex] == false
         )
     then
-        calcu_loop1_not_fb($cdrp, $sri);
+        calcu_loop1_not_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -337,7 +345,7 @@ rule &quot;Calcu_loop1_fbtype_with_1_lp_&quot; // 翻班模式为 type=1 使用翻班格
             $gids[$lpindex] == lpId
         )
     then
-        calcu_loop1_fb($cdrp, $sri);
+        calcu_loop1_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -357,7 +365,7 @@ rule &quot;Calcu_loop1_fbtype_with_1_no_lp_&quot; // 翻班模式为 type=1 使用翻班
             weekdays[$fbindex] == true
         )
     then
-        calcu_loop1_not_fb($cdrp, $sri);
+        calcu_loop1_not_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -381,7 +389,7 @@ rule &quot;Calcu_loop1_timetabletype_with_lp_&quot; // 翻班模式为 type=0 使用时刻
             $gids[$lpindex] == lpId
         )
     then
-        calcu_loop1_fb($cdrp, $sri);
+        calcu_loop1_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -398,7 +406,7 @@ rule &quot;Calcu_loop1_timetabletype_with_no_lp_&quot; // 翻班模式为 type=0 使用时
             ruleId == $ruleId
         )
     then
-        calcu_loop1_not_fb($cdrp, $sri);
+        calcu_loop1_not_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -477,18 +485,20 @@ function void calcu_loop2_fb(
-    log.info("calcu_loop2_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
-        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+//    log.info("calcu_loop2_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
 }
 function void calcu_loop2_not_fb(
         Calcu_days_result_pre $cdrp,
         ScheduleRule_input $sri,
-        ScheduleResults_output rs) {
+        ScheduleResults_output rs,
+        Logger log) {
     String $ruleId = $cdrp.getRuleId();
     DateTime $csd2 = $cdrp.getCalcu_start_date_2();
+    DateTime $ced2 = $cdrp.getCalcu_end_date_2();
     Integer $lpindex = $cdrp.getCalcu_index_lp();
     List $gids = $sri.getGuideboardIds();
     Integer $ryindex = $cdrp.getCalcu_index_ry();
@@ -514,6 +524,10 @@ function void calcu_loop2_not_fb(
     $cdrp.setFbgs_index(($fbindex + 1) % $fbfangesize);
     $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+//    log.info("calcu_loop2_not_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
 }
 rule "Calcu_loop2_fbtype_with_0_" // 翻班模式为 type=1 使用翻班格式翻，当天翻班格式是false，就跳过
@@ -532,7 +546,7 @@ rule &quot;Calcu_loop2_fbtype_with_0_&quot; // 翻班模式为 type=1 使用翻班格式
             weekdays[$fbindex] == false
         )
     then
-        calcu_loop2_not_fb($cdrp, $sri, scheduleResult);
+        calcu_loop2_not_fb($cdrp, $sri, scheduleResult, log);
         update($cdrp);
 end
@@ -580,7 +594,7 @@ rule &quot;Calcu_loop2_fbtype_with_1_no_lp_&quot; // 翻班模式为 type=1 使用翻班
             weekdays[$fbindex] == true
         )
     then
-        calcu_loop2_not_fb($cdrp, $sri, scheduleResult);
+        calcu_loop2_not_fb($cdrp, $sri, scheduleResult, log);
         update($cdrp);
 end
@@ -626,7 +640,7 @@ rule &quot;Calcu_loop2_timetabletype_with_no_lp_&quot; // 翻班模式为 type=0 使用时
             ruleId == $ruleId
         )
     then
-        calcu_loop2_not_fb($cdrp, $sri, scheduleResult);
+        calcu_loop2_not_fb($cdrp, $sri, scheduleResult, log);
         update($cdrp);
 end
-//所有模块service配置
+//所有模块service配置
 // 车辆信息service
 angular.module('ScheduleApp').factory(
     'BusInfoManageService_g',
@@ -79,7 +79,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
@@ -119,7 +119,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;DeviceInfoManageService_g&#39;, [&#39;$resource&#39;,
             }
         }
     );
-}]);
+}]);
 // 人员信息service
 angular.module('ScheduleApp').factory(
     'EmployeeInfoManageService_g',
@@ -183,7 +183,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
 );
-
+
 // 车辆配置service
 angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) {
     return {
@@ -238,7 +238,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
             }
         )
     };
-}]);
+}]);
 // 线路运营统计service
 angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
     return $resource(
@@ -254,7 +254,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusLineInfoStatService_g&#39;, [&#39;$resource&#39;, 
         }
     );
 }]);
-
+
 // 人员配置service
 angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
     return {
@@ -338,7 +338,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
             }
         )
     };
-}]);
+}]);
 // 路牌管理service
 angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
     return {
@@ -411,7 +411,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
             }
         )
     };
-}]);
+}]);
 // 套跑管理service
 angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {
     return {
@@ -453,7 +453,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
             }
         )
     };
-}]);
+}]);
 // 排班计划管理service
 angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
     return {
@@ -612,13 +612,13 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     };
-}]);
+}]);
 // 排班管理service
 angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {
     return {
         rest: $resource(
             '/sr1fc/:id',
-            {order: 'xl.id,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,ASC', id: '@id'},
+            {order: 'xl.id,fbtype,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -671,7 +671,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
         )
     };
 }]);
-
+
 // 时刻表管理service
 angular.module('ScheduleApp').factory(
     'TTInfoManageService_g',
@@ -838,7 +838,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
 // 文件下载服务
@@ -56,7 +56,8 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.page()['content']"
+                ng-class="{odd: true, gradeX: true, info: ctrl.isFBGSMODE(info.fbtype), 'row-active': ctrl.isFBGSMODE(info.fbtype)}">
                 <td>
                     <div>
                         <a href="#">
@@ -107,7 +108,7 @@
                 <td>
                     <a href="#"
                        tooltip-animation="false"
-                       tooltip-placement="top"
+                       tooltip-placement="left-top"
                        uib-tooltip="{{info.ryDbbms}}"
                        tooltip-class="headClass">
                         {{info.ryDbbms}}
@@ -116,7 +117,7 @@
                 <td>
                     <a href="#"
                        tooltip-animation="false"
-                       tooltip-placement="top"
+                       tooltip-placement="left-top"
                        uib-tooltip="{{info.fbgs}}"
                        tooltip-class="headClass">
                         {{info.fbgs}}
@@ -245,6 +245,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.doPage();
+            // 是否是翻班格式模式
+            self.isFBGSMODE = function(type) {
+                return type == "FBGSMODE";
+            }
+
         }
     ]
 );