PSM-12

徐烜
1 parent b6957fef
Showing 11 changed files with 26 additions and 11 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/edit-detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/index.html
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
@@ -240,6 +240,11 @@ public class SchedulePlanInfo {
         this.jhlc = ttInfoDetail.getJhlc(); // 计划里程
         this.bcsj = ttInfoDetail.getBcsj(); // 班次时间
+        // 使用的时刻表id
+        this.ttInfo = ttInfoDetail.getTtinfo().getId();
+        // 使用的时刻表名字
+        this.ttInfoName = ttInfoDetail.getTtinfo().getName();
+
     }
@@ -38,6 +38,9 @@ public class PredicatesBuilder {
         } else if (String.class.isAssignableFrom(leftType) &&
                 (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String == String/Number
             return cb.equal(expression, object);
+        } else if (Boolean.class.isAssignableFrom(leftType) &&
+                Boolean.class.isAssignableFrom(rightType)) {
+            return cb.equal(expression, object);
         } else if (Date.class.isAssignableFrom(leftType) &&
                 Date.class.isAssignableFrom(rightType)) { // Date == Date
             return cb.equal(expression, object);
@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import java.util.*;
@@ -50,8 +51,14 @@ public class IStrategyImpl implements IStrategy {
     @Override
     public Line getLine(Integer xlId) {
-        Line xl = lineService.findById(xlId); // 查找线路具体信息
-        return xl;
+        Map<String, Object> param = new HashMap<>();
+        param.put("id_eq", xlId);
+        param.put("destroy_eq", 0); // 未撤销
+        List<Line> lines = (List<Line>) lineService.list(param);
+        if (CollectionUtils.isEmpty(lines)) {
+            throw new RuntimeException("线路找不到，可能已经撤销！");
+        }
+        return lines.get(0);
     }
     @Override
 <div ng-controller="TimeTableDetailManageFormCtrl_old as ctrl">
     <div class="page-head">
         <div class="page-title">
-            <h1>修改班次信息2</h1>
+            <h1>修改班次信息</h1>
         </div>
     </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>时刻表管理2</h1>
+        <h1>时刻表管理</h1>
     </div>
 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>时刻表管理2</h1>
+        <h1>时刻表管理</h1>
     </div>
 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>时刻表管理2</h1>
+        <h1>时刻表管理</h1>
     </div>
 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>时刻表管理2</h1>
+        <h1>时刻表管理</h1>
     </div>
 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>时刻表管理2</h1>
+        <h1>时刻表管理</h1>
     </div>
 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>时刻表管理2</h1>
+        <h1>时刻表管理</h1>
     </div>
 </div>
@@ -58,7 +58,7 @@ public class DroolsRulesTest {
         session.dispose();
     }
-    @Test
+//    @Test
     public void ttinfoDrlTest() throws Exception {
         logger.info("------------ttinfoDrlTest 测试---------------");
@@ -133,7 +133,7 @@ public class DroolsRulesTest {
     }
-//    @Test
+    @Test
     public void shiftloopDrlTest() throws Exception {
         // 1、创建session，内部配置的是stateful
         KieSession session = kieBase.newKieSession();