Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 27bfba31 96e303f1
Showing 7 changed files with 35 additions and 9 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
src/test/resources/testdata/problem.properties
src/test/resources/testdata/test6.txt
@@ -27,6 +27,8 @@ public class SchedulePlanRuleResult {
  
     /** 排班规则id */
     private String ruleId;
+    /** 启用日期 */
+    private Date qyrq;
     /** 车辆配置id */
     private String ccId;
     /** 车辆自编号 */
@@ -249,4 +251,12 @@ public class SchedulePlanRuleResult {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
 }
@@ -113,6 +113,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 SchedulePlanRuleResult obj = new SchedulePlanRuleResult();
                 obj.setRuleId(rs.getString("rule_id"));
                 obj.setCcZbh(rs.getString("cc_zbh"));
+                obj.setQyrq(rs.getDate("qyrq"));
                 obj.setGids(rs.getString("gids"));
                 obj.setEcids(rs.getString("ecids"));
                 obj.setScheduleDate(rs.getDate("schedule_date"));
@@ -92,7 +92,7 @@ public class ScheduleRule_input {
                         scheduleRule1Flat.getRyConfigIds()
         );
  
-        System.out.println("rule的md5：" + ruleMd5 + " 车辆：" + scheduleRule1Flat.getCarConfigInfo().getCl().getInsideCode());
+//        System.out.println("rule的md5：" + ruleMd5 + " 车辆：" + scheduleRule1Flat.getCarConfigInfo().getCl().getInsideCode());
  
         this.self = scheduleRule1Flat;
     }
@@ -148,11 +148,7 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
             $self: schedulePlan
         )
         eval($self.getIsHistoryPlanFirst() == true) // 是否使用历史排班标识
-        $sprr: SchedulePlanRuleResult() from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
-        ScheduleRule_input(
-            ruleId == $sprr.getRuleId(),
-            $qyrq: qyrq
-        )
+        $sprr: SchedulePlanRuleResult($qyrq: qyrq) from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
  
     then
         // 创建班序历史结果数据
@@ -163,11 +159,11 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
  
         // 规则Md5编码
         String md5 = Md5Util.getMd5(
-            String.valueOf($qyrq.getMillis()) + "_" +
+            String.valueOf($qyrq.getTime()) + "_" +
             $sprr.getGids() + "_" + $sprr.getEcids()
         );
  
-        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
+//        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
  
         schedulePlanRuleResult_wrap.setRuleMd5(md5);
  
@@ -33,7 +33,7 @@
                     </sa-Select5>
                 </td>
                 <td>
-                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['clBm_like']" placeholder="输入内部编号..."/>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['clZbh_like']" placeholder="输入内部编号..."/>
                 </td>
                 <td></td>
                 <td></td>
@@ -29,3 +29,5 @@
 ##28=时刻表导出，元数据ktr转换站名匹配有问题
 ##29=时刻编辑，超过70个班次，报错，改成150个班次
 ##30=时刻表公里数 三位数
+
+31=规则修改，路牌范围，人员范围可以拖动
+select * from bsth_c_s_sp_rule_rst;
+
+select * from bsth_c_s_sp_rule_rst
+where qyrq is null;
+
+update bsth_c_s_sp_rule_rst a
+set a.qyrq = (select qyrq from bsth_c_s_sr1_flat where id = a.rule_id)
+where a.qyrq is null;
+
+970
+789
+604
+985
+北蔡2路
+1048
+1118
+上南二分通勤
 \ No newline at end of file