Commit 4f683c4920ea63bc7c46103723b31ac80fab0739
1 parent
6d82b0f7
工时统计报表，添加小计
Showing
1 changed file
with
24 additions
and
3 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -3688,6 +3688,15 @@ public class ReportServiceImpl implements ReportService{ | @@ -3688,6 +3688,15 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3688 | map.put("sjks", bcsj_ks + Long.valueOf(map.get("sjks").toString())); | 3688 | map.put("sjks", bcsj_ks + Long.valueOf(map.get("sjks").toString())); |
| 3689 | } | 3689 | } |
| 3690 | 3690 | ||
| 3691 | + Map<String, Object> sumMap = new HashMap<String, Object>(); | ||
| 3692 | + sumMap.put("date", "小计"); | ||
| 3693 | + sumMap.put("gsName", ""); | ||
| 3694 | + sumMap.put("fgsName", ""); | ||
| 3695 | + sumMap.put("xlName", ""); | ||
| 3696 | + sumMap.put("lpName", ""); | ||
| 3697 | + sumMap.put("jsy", ""); | ||
| 3698 | + sumMap.put("clZbh", ""); | ||
| 3699 | + Long jh_sum = 0l, sjyy_sum = 0l, sjks_sum = 0l; | ||
| 3691 | for(String key : keyMap.keySet()){ | 3700 | for(String key : keyMap.keySet()){ |
| 3692 | Map<String, Object> map = keyMap.get(key); | 3701 | Map<String, Object> map = keyMap.get(key); |
| 3693 | if(gh.trim().length() > 0){ | 3702 | if(gh.trim().length() > 0){ |
| @@ -3718,17 +3727,26 @@ public class ReportServiceImpl implements ReportService{ | @@ -3718,17 +3727,26 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3718 | Long jh = Long.valueOf(map.get("jh").toString()); | 3727 | Long jh = Long.valueOf(map.get("jh").toString()); |
| 3719 | Long sjyy = Long.valueOf(map.get("sjyy").toString()); | 3728 | Long sjyy = Long.valueOf(map.get("sjyy").toString()); |
| 3720 | Long sjks = Long.valueOf(map.get("sjks").toString()); | 3729 | Long sjks = Long.valueOf(map.get("sjks").toString()); |
| 3721 | - map.put("jhTime", jh/60l + "." + (jh%60l>9?jh%60l:("0"+jh%60l))); | ||
| 3722 | - map.put("sjyyTime", sjyy/60l + "." + (sjyy%60l>9?sjyy%60l:("0"+sjyy%60l))); | ||
| 3723 | - map.put("sjksTime", sjks/60l + "." + (sjks%60l>9?sjks%60l:("0"+sjks%60l))); | 3730 | + map.put("jhTime", jh > 0l ? jh/60l + "." + (jh%60l>9?jh%60l:("0"+jh%60l)) : "0.0"); |
| 3731 | + map.put("sjyyTime", sjyy > 0l ? sjyy/60l + "." + (sjyy%60l>9?sjyy%60l:("0"+sjyy%60l)) : "0.0"); | ||
| 3732 | + map.put("sjksTime", sjks > 0l ? sjks/60l + "." + (sjks%60l>9?sjks%60l:("0"+sjks%60l)) : "0.0"); | ||
| 3724 | if(date.equals(date2)){ | 3733 | if(date.equals(date2)){ |
| 3725 | map.put("date", date); | 3734 | map.put("date", date); |
| 3726 | } else { | 3735 | } else { |
| 3727 | map.put("date", date + "至" + date2); | 3736 | map.put("date", date + "至" + date2); |
| 3728 | } | 3737 | } |
| 3738 | + | ||
| 3739 | + jh_sum += jh; | ||
| 3740 | + sjyy_sum += sjyy; | ||
| 3741 | + sjks_sum += sjks; | ||
| 3742 | + | ||
| 3729 | resultList.add(map); | 3743 | resultList.add(map); |
| 3730 | } | 3744 | } |
| 3731 | 3745 | ||
| 3746 | + sumMap.put("jhTime", jh_sum > 0l ? jh_sum/60l + "." + (jh_sum%60l>9?jh_sum%60l:("0"+jh_sum%60l)) : "0.0"); | ||
| 3747 | + sumMap.put("sjyyTime", sjyy_sum > 0l ? sjyy_sum/60l + "." + (sjyy_sum%60l>9?sjyy_sum%60l:("0"+sjyy_sum%60l)) : "0.0"); | ||
| 3748 | + sumMap.put("sjksTime", sjks_sum > 0l ? sjks_sum/60l + "." + (sjks_sum%60l>9?sjks_sum%60l:("0"+sjks_sum%60l)) : "0.0"); | ||
| 3749 | + | ||
| 3732 | Collections.sort(resultList, new Comparator<Map<String, Object>>() { | 3750 | Collections.sort(resultList, new Comparator<Map<String, Object>>() { |
| 3733 | @Override | 3751 | @Override |
| 3734 | public int compare(Map<String, Object> c1, Map<String, Object> c2) { | 3752 | public int compare(Map<String, Object> c1, Map<String, Object> c2) { |
| @@ -3776,6 +3794,9 @@ public class ReportServiceImpl implements ReportService{ | @@ -3776,6 +3794,9 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3776 | } | 3794 | } |
| 3777 | }); | 3795 | }); |
| 3778 | 3796 | ||
| 3797 | + //小计，排序结束后再插入 | ||
| 3798 | + resultList.add(sumMap); | ||
| 3799 | + | ||
| 3779 | return resultList; | 3800 | return resultList; |
| 3780 | } | 3801 | } |
| 3781 | 3802 |