Commit 043acec8a6496aa39126e491c62700c959510afd
1 parent
041030bf
业主需求:青浦行车路单显示进出场班次
Showing
1 changed file
with
4 additions
and
4 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -4338,7 +4338,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4338,7 +4338,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4338 | } | 4338 | } |
| 4339 | } | 4339 | } |
| 4340 | 4340 | ||
| 4341 | - if (!(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out"))) { | 4341 | +// if (!(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out"))) { // 2024-11-30青浦行车路单显示进出场班次 |
| 4342 | map = new HashMap<String, Object>(); | 4342 | map = new HashMap<String, Object>(); |
| 4343 | try { | 4343 | try { |
| 4344 | scheduleRealInfo.setBcs(xyz); | 4344 | scheduleRealInfo.setBcs(xyz); |
| @@ -4394,7 +4394,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4394,7 +4394,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4394 | } catch (Exception e) { | 4394 | } catch (Exception e) { |
| 4395 | e.printStackTrace(); | 4395 | e.printStackTrace(); |
| 4396 | } | 4396 | } |
| 4397 | - } | 4397 | +// } |
| 4398 | jhlc += jh; | 4398 | jhlc += jh; |
| 4399 | yygl += sj; | 4399 | yygl += sj; |
| 4400 | if (jh > sj) { | 4400 | if (jh > sj) { |
| @@ -4534,7 +4534,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4534,7 +4534,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4534 | List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>(); | 4534 | List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>(); |
| 4535 | for (int i = 0; i < list.size(); i++) { | 4535 | for (int i = 0; i < list.size(); i++) { |
| 4536 | ScheduleRealInfo s = list.get(i); | 4536 | ScheduleRealInfo s = list.get(i); |
| 4537 | - if (!(s.getBcType().equals("in") || s.getBcType().equals("out"))) { | 4537 | +// if (!(s.getBcType().equals("in") || s.getBcType().equals("out"))) { // 2024-11-30青浦行车路单显示进出场班次 |
| 4538 | String remarks = ""; | 4538 | String remarks = ""; |
| 4539 | Double sjlc = 0.0; | 4539 | Double sjlc = 0.0; |
| 4540 | if (s.getRemarks() != null) { | 4540 | if (s.getRemarks() != null) { |
| @@ -4600,7 +4600,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4600,7 +4600,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4600 | } | 4600 | } |
| 4601 | } | 4601 | } |
| 4602 | 4602 | ||
| 4603 | - } | 4603 | +// } |
| 4604 | 4604 | ||
| 4605 | } | 4605 | } |
| 4606 | 4606 |