Commit 036f0af38ca830037b087eabe17dc3e7f9b4605e
1 parent
1b93cb1d
签卡率的计划值从全日数据改为实时数据
Showing
1 changed file
with
10 additions
and
4 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
| ... | ... | @@ -363,6 +363,7 @@ public class BigscreenService { |
| 363 | 363 | sjsmbc += Long.valueOf(t.get("sjsmbczds").toString()); |
| 364 | 364 | jhqqbc += Long.valueOf(t.get("jhszfcs").toString()); |
| 365 | 365 | sjqqzd += Long.valueOf(t.get("sjszfczds").toString()); |
| 366 | + bcs_qk += Long.valueOf(t.get("jhbc").toString()); | |
| 366 | 367 | if(gpSet.contains(t.get("lineCode").toString())){ |
| 367 | 368 | jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString()); |
| 368 | 369 | sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString()); |
| ... | ... | @@ -404,6 +405,7 @@ public class BigscreenService { |
| 404 | 405 | Map<String, Object> smMap = smList.get(datesMap.get(d)); |
| 405 | 406 | Map<String, Object> qqMap = qqList.get(datesMap.get(d)); |
| 406 | 407 | Map<String, Object> gpMap = gpList.get(datesMap.get(d)); |
| 408 | + Map<String, Object> qkMap = qkList.get(datesMap.get(d)); | |
| 407 | 409 | |
| 408 | 410 | ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString())); |
| 409 | 411 | ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString())); |
| ... | ... | @@ -413,6 +415,7 @@ public class BigscreenService { |
| 413 | 415 | smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString())); |
| 414 | 416 | qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); |
| 415 | 417 | qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); |
| 418 | + qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString())); | |
| 416 | 419 | if(gpSet.contains(t.get("lineCode").toString())){ |
| 417 | 420 | gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); |
| 418 | 421 | gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); |
| ... | ... | @@ -425,11 +428,11 @@ public class BigscreenService { |
| 425 | 428 | if(yyLine.contains(t.get("lineCode").toString())){ |
| 426 | 429 | String d = t.get("date").toString(); |
| 427 | 430 | if(date.equals(d)){ |
| 428 | - bcs_qk += Long.valueOf(t.get("bcs").toString()); | |
| 431 | +// bcs_qk += Long.valueOf(t.get("bcs").toString()); | |
| 429 | 432 | qks += Long.valueOf(t.get("qks").toString()); |
| 430 | 433 | } |
| 431 | 434 | Map<String, Object> qkMap = qkList.get(datesMap.get(d)); |
| 432 | - qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("bcs").toString())); | |
| 435 | +// qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("bcs").toString())); | |
| 433 | 436 | qkMap.put("sj", Long.valueOf(qkMap.get("sj").toString()) + Long.valueOf(t.get("qks").toString())); |
| 434 | 437 | } |
| 435 | 438 | } |
| ... | ... | @@ -798,6 +801,7 @@ public class BigscreenService { |
| 798 | 801 | sjsmbc += Long.valueOf(t.get("sjsmbczds").toString()); |
| 799 | 802 | jhqqbc += Long.valueOf(t.get("jhszfcs").toString()); |
| 800 | 803 | sjqqzd += Long.valueOf(t.get("sjszfczds").toString()); |
| 804 | + bcs_qk += Long.valueOf(t.get("jhbc").toString()); | |
| 801 | 805 | if(gpSet.contains(t.get("lineCode").toString())){ |
| 802 | 806 | jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString()); |
| 803 | 807 | sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString()); |
| ... | ... | @@ -839,6 +843,7 @@ public class BigscreenService { |
| 839 | 843 | Map<String, Object> smMap = smList.get(datesMap.get(d)); |
| 840 | 844 | Map<String, Object> qqMap = qqList.get(datesMap.get(d)); |
| 841 | 845 | Map<String, Object> gpMap = gpList.get(datesMap.get(d)); |
| 846 | + Map<String, Object> qkMap = qkList.get(datesMap.get(d)); | |
| 842 | 847 | |
| 843 | 848 | ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString())); |
| 844 | 849 | ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString())); |
| ... | ... | @@ -848,6 +853,7 @@ public class BigscreenService { |
| 848 | 853 | smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString())); |
| 849 | 854 | qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); |
| 850 | 855 | qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); |
| 856 | + qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString())); | |
| 851 | 857 | if(gpSet.contains(t.get("lineCode").toString())){ |
| 852 | 858 | gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); |
| 853 | 859 | gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); |
| ... | ... | @@ -860,11 +866,11 @@ public class BigscreenService { |
| 860 | 866 | if(yyLine.contains(t.get("lineCode").toString())){ |
| 861 | 867 | String d = t.get("date").toString(); |
| 862 | 868 | if(date.equals(d)){ |
| 863 | - bcs_qk += Long.valueOf(t.get("bcs").toString()); | |
| 869 | +// bcs_qk += Long.valueOf(t.get("bcs").toString()); | |
| 864 | 870 | qks += Long.valueOf(t.get("qks").toString()); |
| 865 | 871 | } |
| 866 | 872 | Map<String, Object> qkMap = qkList.get(datesMap.get(d)); |
| 867 | - qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("bcs").toString())); | |
| 873 | +// qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("bcs").toString())); | |
| 868 | 874 | qkMap.put("sj", Long.valueOf(qkMap.get("sj").toString()) + Long.valueOf(t.get("qks").toString())); |
| 869 | 875 | } |
| 870 | 876 | } | ... | ... |