潘钊 / bsth_control · Commits

Commit f171db9952c01bee73b6cee276bff79ef7204924

Authored by 潘钊
2 parents 315bc128 28d8cc93
build: skipped

Merge branch 'minhang' into pudong 

# Conflicts:
#	src/main/resources/static/index.html
Inline Side-by-side
Showing 6 changed files with 31 additions and 13 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 6 of 20 files are displayed.

src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
  View file @f171db9
... ... @@ -221,7 +221,8 @@ public class SchAttrCalculator {
221 221 for (ScheduleRealInfo sch : list) {
222 222 //如果是出站既出场，忽略出场班次
223 223 if (outConfig == 2 && sch.getBcType().equals("out")
224   - && (!limitPark || park.equals(sch.getQdzCode())))
  224 + && (!limitPark || park.equals(sch.getQdzCode()))
  225 + && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0))
225 226 continue;
226 227  
227 228 //忽略烂班
... ... @@ -259,7 +260,8 @@ public class SchAttrCalculator {
259 260 for (ScheduleRealInfo sch : list) {
260 261 //如果是出站既出场，忽略出场班次
261 262 if (outConfig == 2 && isInout(sch)
262   - && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode())))
  263 + && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode()))
  264 + && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0))
263 265 continue;
264 266  
265 267 //忽略烂班
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @f171db9
... ... @@ -2976,7 +2976,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2976 2976 listS.add(scheduleRealInfo);
2977 2977 }
2978 2978 }
2979   - listS.add(scheduleRealInfo);
2980 2979 }
2981 2980 }
2982 2981  
... ... @@ -3743,6 +3742,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3743 3742 Double jcyl = 0.0;
3744 3743 Double yh = 0.0;
3745 3744 Double jzl = 0.0;
  3745 + Double zlc=0.0;
3746 3746 List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
3747 3747 List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
3748 3748 if(listYlb.size()>0){
... ... @@ -3753,6 +3753,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3753 3753 jcyl=Arith.add(jcyl, y.getJzyl());
3754 3754 yh =Arith.add(yh ,y.getYh());
3755 3755 jzl =Arith.add(jzl, y.getJzl());
  3756 + zlc =Arith.add(zlc, y.getZlc());
3756 3757 }
3757 3758 }else{
3758 3759 type=1;
... ... @@ -3762,6 +3763,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3762 3763 jcyl=Arith.add(jcyl, d.getJzcd());
3763 3764 yh =Arith.add(yh ,d.getHd());
3764 3765 jzl =Arith.add(jzl, d.getCdl());
  3766 + zlc =Arith.add(zlc, d.getZlc());
3765 3767 }
3766 3768 }
3767 3769  
... ... @@ -3772,7 +3774,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3772 3774 map.put("ccyl", ccyl);
3773 3775 map.put("jcyl", jcyl);
3774 3776 map.put("type", type);
3775   -
  3777 + map.put("zlc", zlc);
3776 3778 map.put("xlName", s.getXlName());
3777 3779 map.put("clZbh", s.getClZbh());
3778 3780 map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @f171db9
... ... @@ -460,7 +460,21 @@ public class CulateMileageServiceImpl implements CulateMileageService{
460 460 if(!time.equals("")){
461 461 String[] fcsjStr = time.split(":");
462 462 long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
463   - if(childTaskPlans.isEmpty()){
  463 + if(scheduleRealInfo.getStatus()!=-1){
  464 + if(item.equals("zgf")){
  465 + if(fcsj>=zgf1 && fcsj<=zgf2){
  466 + sjbc++;
  467 + }
  468 + }else if(item.equals("wgf")){
  469 + if(fcsj>=wgf1 && fcsj<=wgf2){
  470 + sjbc++;
  471 + }
  472 + }else{
  473 + sjbc++;
  474 + }
  475 +
  476 + }
  477 + /*if(childTaskPlans.isEmpty()){
464 478 if(scheduleRealInfo.getStatus()!=-1){
465 479 if(item.equals("zgf")){
466 480 if(fcsj>=zgf1 && fcsj<=zgf2){
... ... @@ -515,7 +529,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
515 529 sjbc++;
516 530 }
517 531 }
518   - }
  532 + }*/
519 533 }
520 534 }
521 535 }
... ...
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
  View file @f171db9
... ... @@ -426,8 +426,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
426 426 public SchedulePlan save(SchedulePlan schedulePlan) {
427 427 // pre、如果排班的数据之前已经有了，删除之前的数据
428 428 Date startpre = new Date();
429   - scheduleRuleService.deelteSchedulePlanInfo(
430   - schedulePlan.getXl().getId(),
  429 + scheduleRuleService.deleteSchedulePlanInfo(
  430 + schedulePlan.getXl().getLineCode(),
431 431 schedulePlan.getScheduleFromTime(),
432 432 schedulePlan.getScheduleToTime());
433 433 Date endpre = new Date();
... ...
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
  View file @f171db9
... ... @@ -44,11 +44,11 @@ public interface ScheduleRuleService {
44 44  
45 45 /**
46 46 * 删除指定时间范围的排班明细。
47   - * @param xlid 线路id
  47 + * @param xlbm 线路编码
48 48 * @param datefrom 开始日期
49 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
  View file @f171db9
... ... @@ -137,9 +137,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
137 137 }
138 138  
139 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 145 @Override
... ...