Commit 1cf95f26165eb4c06645ca1e970d5bf3dba71205
1 parent
da1b70f0
1、修改计划调度预设区间功能，添加是否预设选项
Showing
6 changed files
with
48 additions
and
29 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
| ... | ... | @@ -127,8 +127,8 @@ public class SchedulePlanInfo extends BEntity { |
| 127 | 127 | @Column(nullable = false) |
| 128 | 128 | private String bcType; |
| 129 | 129 | |
| 130 | - /** 班次类型为区间时，关联预设线路区间id */ | |
| 131 | - private Integer lineRegion; | |
| 130 | + /** 班次类型为区间时，关联预设[线路区间id]_[seq] */ | |
| 131 | + private String lineRegion; | |
| 132 | 132 | |
| 133 | 133 | // 重要的新增字段 |
| 134 | 134 | /** 关联的时刻表id */ |
| ... | ... | @@ -353,7 +353,8 @@ public class SchedulePlanInfo extends BEntity { |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | // 时刻表新增的线路区间 |
| 356 | - this.lineRegion = ttInfoDetail.getLineRegion() == null ? null : ttInfoDetail.getLineRegion().getId(); | |
| 356 | + this.lineRegion = ttInfoDetail.getLineRegion() == null ? null : | |
| 357 | + (ttInfoDetail.getLineRegion().getId() + "_" + ttInfoDetail.getLineRegion().getSeq()); | |
| 357 | 358 | } |
| 358 | 359 | |
| 359 | 360 | // 时刻明细数据 |
| ... | ... | @@ -475,7 +476,7 @@ public class SchedulePlanInfo extends BEntity { |
| 475 | 476 | if (this.ttInfoName != null) ps.setString(34, this.ttInfoName); else ps.setNull(34, Types.VARCHAR); |
| 476 | 477 | if (this.remark != null) ps.setString(35, this.remark); else ps.setNull(35, Types.VARCHAR); |
| 477 | 478 | if (this.schedulePlan != null) ps.setLong(36, this.schedulePlan.getId()); else ps.setNull(36, Types.BIGINT); |
| 478 | - if (this.lineRegion != null) ps.setLong(37, this.lineRegion); else ps.setNull(37, Types.INTEGER); | |
| 479 | + if (this.lineRegion != null) ps.setString(37, this.lineRegion); else ps.setNull(37, Types.VARCHAR); | |
| 479 | 480 | if (this.getCreateBy() != null) ps.setInt(38, this.getCreateBy().getId()); else ps.setNull(38, Types.INTEGER); |
| 480 | 481 | if (this.getUpdateBy() != null) ps.setInt(39, this.getUpdateBy().getId()); else ps.setNull(39, Types.INTEGER); |
| 481 | 482 | 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 { |
| 802 | 803 | this.modifyCount = modifyCount; |
| 803 | 804 | } |
| 804 | 805 | |
| 805 | - public Integer getLineRegion() { | |
| 806 | + public String getLineRegion() { | |
| 806 | 807 | return lineRegion; |
| 807 | 808 | } |
| 808 | 809 | |
| 809 | - public void setLineRegion(Integer lineRegion) { | |
| 810 | + public void setLineRegion(String lineRegion) { | |
| 810 | 811 | this.lineRegion = lineRegion; |
| 811 | 812 | } |
| 812 | 813 | } | ... | ... |
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
| ... | ... | @@ -88,6 +88,8 @@ public class TTInfoDetail extends BEntity { |
| 88 | 88 | @Column(nullable = false) |
| 89 | 89 | private String bcType; |
| 90 | 90 | |
| 91 | + /** 班次类型位区间时，是否预设区间 */ | |
| 92 | + private Boolean isLR; | |
| 91 | 93 | /** 班次类型为区间时，关联预设线路区间对象 表 bsth_c_line_region */ |
| 92 | 94 | @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY) |
| 93 | 95 | private LineRegion lineRegion; |
| ... | ... | @@ -356,4 +358,12 @@ public class TTInfoDetail extends BEntity { |
| 356 | 358 | public void setLineRegion(LineRegion lineRegion) { |
| 357 | 359 | this.lineRegion = lineRegion; |
| 358 | 360 | } |
| 361 | + | |
| 362 | + public Boolean getIsLR() { | |
| 363 | + return isLR; | |
| 364 | + } | |
| 365 | + | |
| 366 | + public void setIsLR(Boolean isLR) { | |
| 367 | + this.isLR = isLR; | |
| 368 | + } | |
| 359 | 369 | } | ... | ... |
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saLineRegion.js
| ... | ... | @@ -125,25 +125,23 @@ angular.module('ScheduleApp').directive( |
| 125 | 125 | function(result) { |
| 126 | 126 | scope[ctrlAs].$$internalLineRegionList = result; |
| 127 | 127 | |
| 128 | - // 将线路区间路由站点名用逗号连接成字符串，并赋于新属性 | |
| 128 | + // 1、将线路区间路由站点名用逗号连接成字符串，并赋于新属性 | |
| 129 | + // 2、如果之前保存过预设区间，查找result中对应的区间 | |
| 130 | + var xlrgid_value = null; | |
| 129 | 131 | angular.forEach(result, function(value) { |
| 130 | 132 | var _str_ = []; |
| 131 | 133 | angular.forEach(value.lineStationRouteDtoList, function(value2) { |
| 132 | 134 | _str_.push(value2.stationName); |
| 133 | 135 | }); |
| 134 | 136 | value.$$internal_route_strs = _str_.join(","); |
| 135 | - }); | |
| 136 | 137 | |
| 138 | + if (value.regionId == scope[ctrlAs].xlrgid) { | |
| 139 | + xlrgid_value = value; | |
| 140 | + } | |
| 141 | + }); | |
| 137 | 142 | |
| 138 | - // 如果之前保持过预设区间，则模拟点击选择 | |
| 139 | - if (scope[ctrlAs].xlrgid) { | |
| 140 | - angular.forEach(result, function(value) { | |
| 141 | - if (value.regionId == scope[ctrlAs].xlrgid) { | |
| 142 | - scope[ctrlAs].$$internalSelectLineRegion(value); | |
| 143 | - } else { | |
| 144 | - return; | |
| 145 | - } | |
| 146 | - }); | |
| 143 | + if (xlrgid_value) { // 找到区间后模拟点击 | |
| 144 | + scope[ctrlAs].$$internalSelectLineRegion(xlrgid_value); | |
| 147 | 145 | } else { |
| 148 | 146 | // 重置选择 |
| 149 | 147 | scope[ctrlAs].$$internalLineRegionSelected = undefined; | ... | ... |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
| ... | ... | @@ -6726,25 +6726,23 @@ angular.module('ScheduleApp').directive( |
| 6726 | 6726 | function(result) { |
| 6727 | 6727 | scope[ctrlAs].$$internalLineRegionList = result; |
| 6728 | 6728 | |
| 6729 | - // 将线路区间路由站点名用逗号连接成字符串，并赋于新属性 | |
| 6729 | + // 1、将线路区间路由站点名用逗号连接成字符串，并赋于新属性 | |
| 6730 | + // 2、如果之前保存过预设区间，查找result中对应的区间 | |
| 6731 | + var xlrgid_value = null; | |
| 6730 | 6732 | angular.forEach(result, function(value) { |
| 6731 | 6733 | var _str_ = []; |
| 6732 | 6734 | angular.forEach(value.lineStationRouteDtoList, function(value2) { |
| 6733 | 6735 | _str_.push(value2.stationName); |
| 6734 | 6736 | }); |
| 6735 | 6737 | value.$$internal_route_strs = _str_.join(","); |
| 6736 | - }); | |
| 6737 | 6738 | |
| 6739 | + if (value.regionId == scope[ctrlAs].xlrgid) { | |
| 6740 | + xlrgid_value = value; | |
| 6741 | + } | |
| 6742 | + }); | |
| 6738 | 6743 | |
| 6739 | - // 如果之前保持过预设区间，则模拟点击选择 | |
| 6740 | - if (scope[ctrlAs].xlrgid) { | |
| 6741 | - angular.forEach(result, function(value) { | |
| 6742 | - if (value.regionId == scope[ctrlAs].xlrgid) { | |
| 6743 | - scope[ctrlAs].$$internalSelectLineRegion(value); | |
| 6744 | - } else { | |
| 6745 | - return; | |
| 6746 | - } | |
| 6747 | - }); | |
| 6744 | + if (xlrgid_value) { // 找到区间后模拟点击 | |
| 6745 | + scope[ctrlAs].$$internalSelectLineRegion(xlrgid_value); | |
| 6748 | 6746 | } else { |
| 6749 | 6747 | // 重置选择 |
| 6750 | 6748 | scope[ctrlAs].$$internalLineRegionSelected = undefined; | ... | ... |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
| ... | ... | @@ -232,6 +232,14 @@ |
| 232 | 232 | |
| 233 | 233 | <div class="form-group has-success has-feedback" |
| 234 | 234 | ng-if="ctrl.TimeTableDetailForSave.bcType == 'region' "> |
| 235 | + <label class="col-md-2 control-label">是否预设：</label> | |
| 236 | + <div class="col-md-3"> | |
| 237 | + <sa-Radiogroup model="ctrl.TimeTableDetailForSave.isLR" dicgroup="truefalseType" name="isLR"></sa-Radiogroup> | |
| 238 | + </div> | |
| 239 | + | |
| 240 | + </div> | |
| 241 | + <div class="form-group has-success has-feedback" | |
| 242 | + ng-if="ctrl.TimeTableDetailForSave.isLR && ctrl.TimeTableDetailForSave.bcType == 'region' "> | |
| 235 | 243 | <label class="col-md-2 control-label">预设区间*：</label> |
| 236 | 244 | <div class="col-md-6"> |
| 237 | 245 | <sa-line-region name="sa_line_region" | ... | ... |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
| ... | ... | @@ -823,6 +823,9 @@ angular.module('ScheduleApp').controller( |
| 823 | 823 | "->发车顺序号" + self.TimeTableDetailForSave.fcno + |
| 824 | 824 | "->班次详细信息"; |
| 825 | 825 | |
| 826 | + // 设定是否预设区间 | |
| 827 | + self.TimeTableDetailForSave.isLR = self.TimeTableDetailForSave.isLR || false; | |
| 828 | + | |
| 826 | 829 | // 添加编码加名字组合字段 |
| 827 | 830 | self.TimeTableDetailForSave["qcode_name"] = self.TimeTableDetailForSave["qdzCode"] + "_" + self.TimeTableDetailForSave["qdzName"]; |
| 828 | 831 | self.TimeTableDetailForSave["zcode_name"] = self.TimeTableDetailForSave["zdzCode"] + "_" + self.TimeTableDetailForSave["zdzName"]; |
| ... | ... | @@ -841,6 +844,7 @@ angular.module('ScheduleApp').controller( |
| 841 | 844 | |
| 842 | 845 | self.TimeTableDetailForSave.lineVersion = self.lineversion; |
| 843 | 846 | self.TimeTableDetailForSave.isTS = 0; |
| 847 | + self.TimeTableDetailForSave.isLR = 0; // 设定是否预设区间 | |
| 844 | 848 | self.title2 = |
| 845 | 849 | self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" + |
| 846 | 850 | "->路牌" + self.TimeTableDetailForSave.lp.lpName + |
| ... | ... | @@ -860,7 +864,7 @@ angular.module('ScheduleApp').controller( |
| 860 | 864 | delete self.TimeTableDetailForSave["qcode_name"]; |
| 861 | 865 | delete self.TimeTableDetailForSave["zcode_name"]; |
| 862 | 866 | // lineRegion预处理 |
| 863 | - if (self.TimeTableDetailForSave.bcType != "region") { | |
| 867 | + if (!(self.TimeTableDetailForSave.bcType == "region" && self.TimeTableDetailForSave.isLR)) { | |
| 864 | 868 | delete self.TimeTableDetailForSave["lineRegion"]; |
| 865 | 869 | } |
| 866 | 870 | ... | ... |