Commit 9009fee3bfc5a8dd17352e9cc7ab1fc15f3748f5

Authored by 徐烜
1 parent 36a2af96

Update

Too many changes to show.

To preserve performance only 3 of 15 files are displayed.

src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
@@ -426,8 +426,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> im @@ -426,8 +426,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> im
426 public SchedulePlan save(SchedulePlan schedulePlan) { 426 public SchedulePlan save(SchedulePlan schedulePlan) {
427 // pre、如果排班的数据之前已经有了,删除之前的数据 427 // pre、如果排班的数据之前已经有了,删除之前的数据
428 Date startpre = new Date(); 428 Date startpre = new Date();
429 - scheduleRuleService.deelteSchedulePlanInfo(  
430 - schedulePlan.getXl().getId(), 429 + scheduleRuleService.deleteSchedulePlanInfo(
  430 + schedulePlan.getXl().getLineCode(),
431 schedulePlan.getScheduleFromTime(), 431 schedulePlan.getScheduleFromTime(),
432 schedulePlan.getScheduleToTime()); 432 schedulePlan.getScheduleToTime());
433 Date endpre = new Date(); 433 Date endpre = new Date();
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
@@ -44,11 +44,11 @@ public interface ScheduleRuleService { @@ -44,11 +44,11 @@ public interface ScheduleRuleService {
44 44
45 /** 45 /**
46 * 删除指定时间范围的排班明细。 46 * 删除指定时间范围的排班明细。
47 - * @param xlid 线路id 47 + * @param xlbm 线路编码
48 * @param datefrom 开始日期 48 * @param datefrom 开始日期
49 * @param dateto 结束日期 49 * @param dateto 结束日期
50 */ 50 */
51 - void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto); 51 + void deleteSchedulePlanInfo(String xlbm, Date datefrom, Date dateto);
52 52
53 /** 53 /**
54 * 查找线路的套跑规则,并封装成规则输入对象。 54 * 查找线路的套跑规则,并封装成规则输入对象。
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
@@ -137,9 +137,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService { @@ -137,9 +137,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
137 } 137 }
138 138
139 @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED) 139 @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
140 - public void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto) {  
141 - String sql = "delete from bsth_c_s_sp_info where xl = ? and schedule_date >= ? and schedule_date <= ?";  
142 - jdbcTemplate.update(sql, xlid, datefrom, dateto); 140 + public void deleteSchedulePlanInfo(String xlbm, Date datefrom, Date dateto) {
  141 + String sql = "delete from bsth_c_s_sp_info where xl_bm = ? and schedule_date >= ? and schedule_date <= ?";
  142 + jdbcTemplate.update(sql, xlbm, datefrom, dateto);
143 } 143 }
144 144
145 @Override 145 @Override