1、修改计划调度预设区间功能，添加是否预设选项

徐烜
1 parent da1b70f0
Showing 6 changed files with 48 additions and 29 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saLineRegion.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
@@ -127,8 +127,8 @@ public class SchedulePlanInfo extends BEntity {
     @Column(nullable = false)
     private String bcType;
-    /** 班次类型为区间时，关联预设线路区间id */
-    private Integer lineRegion;
+    /** 班次类型为区间时，关联预设[线路区间id]_[seq] */
+    private String lineRegion;
     // 重要的新增字段
     /** 关联的时刻表id */
@@ -353,7 +353,8 @@ public class SchedulePlanInfo extends BEntity {
             }
             // 时刻表新增的线路区间
-            this.lineRegion = ttInfoDetail.getLineRegion() == null ? null : ttInfoDetail.getLineRegion().getId();
+            this.lineRegion = ttInfoDetail.getLineRegion() == null ? null :
+                    (ttInfoDetail.getLineRegion().getId() + "_" + ttInfoDetail.getLineRegion().getSeq());
         }
         // 时刻明细数据
@@ -475,7 +476,7 @@ public class SchedulePlanInfo extends BEntity {
         if (this.ttInfoName != null) ps.setString(34, this.ttInfoName); else ps.setNull(34, Types.VARCHAR);
         if (this.remark != null) ps.setString(35, this.remark); else ps.setNull(35, Types.VARCHAR);
         if (this.schedulePlan != null) ps.setLong(36, this.schedulePlan.getId()); else ps.setNull(36, Types.BIGINT);
-        if (this.lineRegion != null) ps.setLong(37, this.lineRegion); else ps.setNull(37, Types.INTEGER);
+        if (this.lineRegion != null) ps.setString(37, this.lineRegion); else ps.setNull(37, Types.VARCHAR);
         if (this.getCreateBy() != null) ps.setInt(38, this.getCreateBy().getId()); else ps.setNull(38, Types.INTEGER);
         if (this.getUpdateBy() != null) ps.setInt(39, this.getUpdateBy().getId()); else ps.setNull(39, Types.INTEGER);
         if (this.getCreateDate() != null) ps.setTimestamp(40, new java.sql.Timestamp(this.getCreateDate().getTime())); else ps.setNull(40, Types.TIMESTAMP);
@@ -802,11 +803,11 @@ public class SchedulePlanInfo extends BEntity {
         this.modifyCount = modifyCount;
     }
-    public Integer getLineRegion() {
+    public String getLineRegion() {
         return lineRegion;
     }
-    public void setLineRegion(Integer lineRegion) {
+    public void setLineRegion(String lineRegion) {
         this.lineRegion = lineRegion;
     }
 }
@@ -88,6 +88,8 @@ public class TTInfoDetail extends BEntity {
     @Column(nullable = false)
     private String bcType;
+    /** 班次类型位区间时，是否预设区间 */
+    private Boolean isLR;
     /** 班次类型为区间时，关联预设线路区间对象 表 bsth_c_line_region */
     @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private LineRegion lineRegion;
@@ -356,4 +358,12 @@ public class TTInfoDetail extends BEntity {
     public void setLineRegion(LineRegion lineRegion) {
         this.lineRegion = lineRegion;
     }
+
+    public Boolean getIsLR() {
+        return isLR;
+    }
+
+    public void setIsLR(Boolean isLR) {
+        this.isLR = isLR;
+    }
 }
@@ -125,25 +125,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     function(result) {
                                         scope[ctrlAs].$$internalLineRegionList = result;
-                                        // 将线路区间路由站点名用逗号连接成字符串，并赋于新属性
+                                        // 1、将线路区间路由站点名用逗号连接成字符串，并赋于新属性
+                                        // 2、如果之前保存过预设区间，查找result中对应的区间
+                                        var xlrgid_value = null;
                                         angular.forEach(result, function(value) {
                                             var _str_ = [];
                                             angular.forEach(value.lineStationRouteDtoList, function(value2) {
                                                 _str_.push(value2.stationName);
                                             });
                                             value.$$internal_route_strs = _str_.join(",");
-                                        });
+                                            if (value.regionId == scope[ctrlAs].xlrgid) {
+                                                xlrgid_value = value;
+                                            }
+                                        });
-                                        // 如果之前保持过预设区间，则模拟点击选择
-                                        if (scope[ctrlAs].xlrgid) {
-                                            angular.forEach(result, function(value) {
-                                                if (value.regionId == scope[ctrlAs].xlrgid) {
-                                                    scope[ctrlAs].$$internalSelectLineRegion(value);
-                                                } else {
-                                                    return;
-                                                }
-                                            });
+                                        if (xlrgid_value) { // 找到区间后模拟点击
+                                            scope[ctrlAs].$$internalSelectLineRegion(xlrgid_value);
                                         } else {
                                             // 重置选择
                                             scope[ctrlAs].$$internalLineRegionSelected = undefined;
@@ -6726,25 +6726,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     function(result) {
                                         scope[ctrlAs].$$internalLineRegionList = result;
-                                        // 将线路区间路由站点名用逗号连接成字符串，并赋于新属性
+                                        // 1、将线路区间路由站点名用逗号连接成字符串，并赋于新属性
+                                        // 2、如果之前保存过预设区间，查找result中对应的区间
+                                        var xlrgid_value = null;
                                         angular.forEach(result, function(value) {
                                             var _str_ = [];
                                             angular.forEach(value.lineStationRouteDtoList, function(value2) {
                                                 _str_.push(value2.stationName);
                                             });
                                             value.$$internal_route_strs = _str_.join(",");
-                                        });
+                                            if (value.regionId == scope[ctrlAs].xlrgid) {
+                                                xlrgid_value = value;
+                                            }
+                                        });
-                                        // 如果之前保持过预设区间，则模拟点击选择
-                                        if (scope[ctrlAs].xlrgid) {
-                                            angular.forEach(result, function(value) {
-                                                if (value.regionId == scope[ctrlAs].xlrgid) {
-                                                    scope[ctrlAs].$$internalSelectLineRegion(value);
-                                                } else {
-                                                    return;
-                                                }
-                                            });
+                                        if (xlrgid_value) { // 找到区间后模拟点击
+                                            scope[ctrlAs].$$internalSelectLineRegion(xlrgid_value);
                                         } else {
                                             // 重置选择
                                             scope[ctrlAs].$$internalLineRegionSelected = undefined;
@@ -232,6 +232,14 @@
                     <div class="form-group has-success has-feedback"
                          ng-if="ctrl.TimeTableDetailForSave.bcType == 'region' ">
+                        <label class="col-md-2 control-label">是否预设：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.TimeTableDetailForSave.isLR" dicgroup="truefalseType" name="isLR"></sa-Radiogroup>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-success has-feedback"
+                         ng-if="ctrl.TimeTableDetailForSave.isLR && ctrl.TimeTableDetailForSave.bcType == 'region' ">
                         <label class="col-md-2 control-label">预设区间*：</label>
                         <div class="col-md-6">
                             <sa-line-region name="sa_line_region"
@@ -823,6 +823,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         "->发车顺序号" + self.TimeTableDetailForSave.fcno +
                         "->班次详细信息";
+                    // 设定是否预设区间
+                    self.TimeTableDetailForSave.isLR = self.TimeTableDetailForSave.isLR || false;
+
                     // 添加编码加名字组合字段
                     self.TimeTableDetailForSave["qcode_name"] = self.TimeTableDetailForSave["qdzCode"] + "_" + self.TimeTableDetailForSave["qdzName"];
                     self.TimeTableDetailForSave["zcode_name"] = self.TimeTableDetailForSave["zdzCode"] + "_" + self.TimeTableDetailForSave["zdzName"];
@@ -841,6 +844,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 self.TimeTableDetailForSave.lineVersion = self.lineversion;
                 self.TimeTableDetailForSave.isTS = 0;
+                self.TimeTableDetailForSave.isLR = 0; // 设定是否预设区间
                 self.title2 =
                     self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" +
                     "->路牌" + self.TimeTableDetailForSave.lp.lpName +
@@ -860,7 +864,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 delete self.TimeTableDetailForSave["qcode_name"];
                 delete self.TimeTableDetailForSave["zcode_name"];
                 // lineRegion预处理
-                if (self.TimeTableDetailForSave.bcType != "region") {
+                if (!(self.TimeTableDetailForSave.bcType == "region" && self.TimeTableDetailForSave.isLR)) {
                     delete self.TimeTableDetailForSave["lineRegion"];
                 }