Update

徐烜
1 parent 304d1a84
Showing 3 changed files with 28 additions and 2 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/resources/application-dev.properties
src/main/resources/rules/shiftloop_fb_2.drl
@@ -19,6 +19,11 @@ public class SchedulePlanRuleResult {
     @GeneratedValue
     private Long id;
+    /** 线路id */
+    private String xlId;
+    /** 线路名字 */
+    private String xlName;
+
     /** 排班规则id */
     private String ruleId;
     /** 车辆配置id */
@@ -55,7 +60,8 @@ public class SchedulePlanRuleResult {
     public SchedulePlanRuleResult(SchedulePlan schedulePlan) {
         this.sysuserId = schedulePlan.getCreateBy().getId().toString();
         this.sysuserName = schedulePlan.getCreateBy().getName();
-        this.createDate = schedulePlan.getCreateDate();
+//        this.createDate = schedulePlan.getCreateDate();
+        this.createDate = new Date();
     }
     public Long getId() {
@@ -169,4 +175,20 @@ public class SchedulePlanRuleResult {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
 }
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password=
 #DATASOURCE
@@ -209,6 +209,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         // 保存排班规则循环结果 --> 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());
@@ -263,6 +265,8 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
         // 保存排班规则循环结果 --> 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());