Commit e78b5a58ed44f0870abcc3f4602a093b21096ffd
1 parent
2f9b4e8f
1
Showing
2 changed files
with
2 additions
and
3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -3255,11 +3255,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3255,11 +3255,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3255 | if (nature.equals("0")) { | 3255 | if (nature.equals("0")) { |
| 3256 | list.add(s); | 3256 | list.add(s); |
| 3257 | }else if(nature.equals("1")){ | 3257 | }else if(nature.equals("1")){ |
| 3258 | - if(lineMap.get(s.getXlBm())){ | 3258 | + if(lineMap.containsKey(s.getXlBm()) && lineMap.get(s.getXlBm())){ |
| 3259 | list.add(s); | 3259 | list.add(s); |
| 3260 | } | 3260 | } |
| 3261 | }else{ | 3261 | }else{ |
| 3262 | - if(!lineMap.get(s.getXlBm())){ | 3262 | + if(!lineMap.containsKey(s.getXlBm()) || !lineMap.get(s.getXlBm())){ |
| 3263 | list.add(s); | 3263 | list.add(s); |
| 3264 | } | 3264 | } |
| 3265 | } | 3265 | } |
src/main/resources/static/pages/forms/statement/statisticsDaily.html
| @@ -330,7 +330,6 @@ | @@ -330,7 +330,6 @@ | ||
| 330 | $get('/realSchedule/statisticsDailyTj',params,function(result){ | 330 | $get('/realSchedule/statisticsDailyTj',params,function(result){ |
| 331 | 331 | ||
| 332 | $.each(result, function(i, e){ | 332 | $.each(result, function(i, e){ |
| 333 | - console.log(e); | ||
| 334 | if(e && e.startDate && e.startDate <= '2025-09-20'){ | 333 | if(e && e.startDate && e.startDate <= '2025-09-20'){ |
| 335 | e.zt = 0; // 要求从更新后开始的数据才标红。 | 334 | e.zt = 0; // 要求从更新后开始的数据才标红。 |
| 336 | } | 335 | } |