Commit f5d79d46d978c169c9a5c06ba9699ca055b578c1
1 parent
6d68dffa
Merge branch 'pudong' into jiading
# Conflicts: # src/main/java/com/bsth/controller/BusIntervalController.java # src/main/java/com/bsth/service/BusIntervalService.java # src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java # src/main/resources/ms-jdbc.properties
Showing
4 changed files
with
6 additions
and
13 deletions
src/main/java/com/bsth/entity/LineVersions.java
| 1 | package com.bsth.entity; | 1 | package com.bsth.entity; |
| 2 | 2 | ||
| 3 | +import javax.persistence.*; | ||
| 3 | import java.util.Date; | 4 | import java.util.Date; |
| 4 | 5 | ||
| 5 | -import javax.persistence.Column; | ||
| 6 | -import javax.persistence.Entity; | ||
| 7 | -import javax.persistence.GeneratedValue; | ||
| 8 | -import javax.persistence.GenerationType; | ||
| 9 | -import javax.persistence.Id; | ||
| 10 | -import javax.persistence.ManyToOne; | ||
| 11 | -import javax.persistence.Table; | ||
| 12 | - | ||
| 13 | 6 | ||
| 14 | /** | 7 | /** |
| 15 | * | 8 | * |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1234 | ScheduleModifyLogger.sftz(sch, fcsjActual, remarks); | 1234 | ScheduleModifyLogger.sftz(sch, fcsjActual, remarks); |
| 1235 | 1235 | ||
| 1236 | sch.setFcsjActualAll(fcsjActual); | 1236 | sch.setFcsjActualAll(fcsjActual); |
| 1237 | - sch.addRemarks(remarks); | 1237 | + sch.setRemarks(remarks); |
| 1238 | sch.calcStatus(); | 1238 | sch.calcStatus(); |
| 1239 | //if(sch.isLate2()){ | 1239 | //if(sch.isLate2()){ |
| 1240 | //取消应发未到标记 | 1240 | //取消应发未到标记 |
src/main/resources/static/pages/history_sch/edit/history_sch_maintain.html
| @@ -512,9 +512,9 @@ | @@ -512,9 +512,9 @@ | ||
| 512 | }); | 512 | }); |
| 513 | 513 | ||
| 514 | //重新统计班次明细 | 514 | //重新统计班次明细 |
| 515 | - gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () { | 515 | + /*gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () { |
| 516 | reCountEp.emitLater('scheduleDetail'); | 516 | reCountEp.emitLater('scheduleDetail'); |
| 517 | - }); | 517 | + });*/ |
| 518 | 518 | ||
| 519 | }, '我确定'); | 519 | }, '我确定'); |
| 520 | }); | 520 | }); |
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
| @@ -448,9 +448,9 @@ | @@ -448,9 +448,9 @@ | ||
| 448 | }); | 448 | }); |
| 449 | 449 | ||
| 450 | //重新统计班次明细 | 450 | //重新统计班次明细 |
| 451 | - gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () { | 451 | + /*gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () { |
| 452 | reCountEp.emitLater('scheduleDetail'); | 452 | reCountEp.emitLater('scheduleDetail'); |
| 453 | - }); | 453 | + });*/ |
| 454 | 454 | ||
| 455 | }, '我确定'); | 455 | }, '我确定'); |
| 456 | }); | 456 | }); |