潘钊 / bsth_control · Commits

Commit 904a133e4562104096ed8826c805e364e6631d9d

Authored by 徐烜
1 parent 37c2c826

Update

Inline Side-by-side
Showing 6 changed files with 33 additions and 8 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
  View file @904a133
... ... @@ -128,6 +128,9 @@ public class SchedulePlanInfo {
128 128 /** 关联的时刻表名字 */
129 129 private String ttInfoName;
130 130  
  131 + /** 时刻表的明细备注 */
  132 + private String remark;
  133 +
131 134  
132 135 /** 创建人 */
133 136 @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
... ... @@ -269,6 +272,9 @@ public class SchedulePlanInfo {
269 272 // 使用的时刻表名字
270 273 this.ttInfoName = ttInfoDetail.getTtinfo().getName();
271 274  
  275 + // 备注信息
  276 + this.remark = ttInfoDetail.getRemark();
  277 +
272 278 // 使用车辆配置的停车场信息
273 279 String pzType = carConfigInfo.getPzType(); // 配置类型
274 280 if (pzType != null && !pzType.equals("BSY")) {
... ... @@ -648,4 +654,12 @@ public class SchedulePlanInfo {
648 654 public void setTtInfoName(String ttInfoName) {
649 655 this.ttInfoName = ttInfoName;
650 656 }
  657 +
  658 + public String getRemark() {
  659 + return remark;
  660 + }
  661 +
  662 + public void setRemark(String remark) {
  663 + this.remark = remark;
  664 + }
651 665 }
... ...
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
  View file @904a133
... ... @@ -46,10 +46,11 @@ public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanI
46 46 "max(user.user_name) as updateUserName, " +
47 47 "max(info.tt_info_name) as ttInfoName " +
48 48 "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
  49 + "left join bsth_c_s_gbi gbi on info.lp = gbi.id " +
49 50 "where info.xl = ?1 and " +
50 51 "info.schedule_date = ?2 " +
51 52 "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
52   - "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
  53 + "order by info.xl_name, info.schedule_date, gbi.lp_no ", nativeQuery = true)
53 54 List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
54 55  
55 56 @Modifying
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTable.js
  View file @904a133
... ... @@ -97,8 +97,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
97 97 }
98 98 }
99 99 } else {
100   - this.isValidInfo = true;
101   - return true;
  100 + this.isValidInfo = false;
  101 + return false;
102 102 }
103 103 };
104 104  
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html
  View file @904a133
... ... @@ -324,7 +324,7 @@
324 324 ng-dblclick="$saTimeTableCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
325 325 ng-class="{
326 326 lpName: !cell.ttdid,
327   - error: cell.invalidFlag,
  327 + error: cell.isValidInfo,
328 328 active: cell.sel,
329 329 region: cell.bc_type == 'region',
330 330 isfb: cell.isfb
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @904a133
... ... @@ -3795,8 +3795,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
3795 3795 }
3796 3796 }
3797 3797 } else {
3798   - this.isValidInfo = true;
3799   - return true;
  3798 + this.isValidInfo = false;
  3799 + return false;
3800 3800 }
3801 3801 };
3802 3802  
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
  View file @904a133
... ... @@ -14,8 +14,9 @@
14 14 <th style="width: 80px;">班次类型</th>
15 15 <th style="width: 80px;">上下行</th>
16 16 <th style="width: 80px;">发车时间</th>
17   - <th style="width: 100px;">起点站</th>
18   - <th style="width: 100px;">终点站</th>
  17 + <th style="width: 80px;">起点站</th>
  18 + <th style="width: 80px;">终点站</th>
  19 + <th style="width: 60px">备注</th>
19 20 <th style="width: 100%">时刻表</th>
20 21 <th style="width: 90px;">修改人</th>
21 22 <th style="width: 90px;">修改时间</th>
... ... @@ -110,6 +111,15 @@
110 111 <a href="#"
111 112 tooltip-animation="false"
112 113 tooltip-placement="top"
  114 + uib-tooltip="{{info.remark}}"
  115 + tooltip-class="headClass">
  116 + {{info.remark}}
  117 + </a>
  118 + </td>
  119 + <td>
  120 + <a href="#"
  121 + tooltip-animation="false"
  122 + tooltip-placement="top"
113 123 uib-tooltip="{{info.ttInfoName}}"
114 124 tooltip-class="headClass">
115 125 {{info.ttInfoName}}
... ...