Commit c3ddae29 authored by libin's avatar libin

Merge branch 'staff-statistics' into dev

parents 9f45f84d 3e08c06f
...@@ -99,10 +99,10 @@ public class StaffStatisticsBiz { ...@@ -99,10 +99,10 @@ public class StaffStatisticsBiz {
Map<String, Map<Integer, Map<Integer, List<AppUserSellingWaterDTO>>>> userSellingWaterMap = sellingWaterMap.get(userStaffBo.getUserId()); Map<String, Map<Integer, Map<Integer, List<AppUserSellingWaterDTO>>>> userSellingWaterMap = sellingWaterMap.get(userStaffBo.getUserId());
if (userSellingWaterMap != null && !userSellingWaterMap.isEmpty()) { if (userSellingWaterMap != null && !userSellingWaterMap.isEmpty()) {
AtomicReference<BigDecimal> royaltyAmountAtomicReference = new AtomicReference<>(BigDecimal.ZERO); AtomicReference<BigDecimal> royaltyAmountAtomicReference = new AtomicReference<>(BigDecimal.ZERO);
List<String> postionNames = new ArrayList<>(); List<String> postionNames = new ArrayList<>(staffStatisticsBo.getPostionNames());
List<Integer> postionIds = new ArrayList<>(); List<Integer> postionIds = new ArrayList<>(staffStatisticsBo.getPostionIds());
List<String> companyNames = new ArrayList<>(); List<String> companyNames = new ArrayList<>(staffStatisticsBo.getCompanyNames());
List<Integer> compnayIds = new ArrayList<>(); List<Integer> compnayIds = new ArrayList<>(staffStatisticsBo.getCompnayIds());
userSellingWaterMap.forEach((K, V) -> { userSellingWaterMap.forEach((K, V) -> {
if (!K.equals(stateGroup)) { if (!K.equals(stateGroup)) {
String[] sates = K.split("-"); String[] sates = K.split("-");
...@@ -128,10 +128,6 @@ public class StaffStatisticsBiz { ...@@ -128,10 +128,6 @@ public class StaffStatisticsBiz {
} }
wrapStaffStatistics(V, royaltyAmountAtomicReference, staffStatisticsBo); wrapStaffStatistics(V, royaltyAmountAtomicReference, staffStatisticsBo);
}); });
compnayIds.addAll(staffStatisticsBo.getCompnayIds());
companyNames.addAll(staffStatisticsBo.getCompanyNames());
postionIds.addAll(staffStatisticsBo.getCompnayIds());
postionNames.addAll(staffStatisticsBo.getPostionNames());
staffStatisticsBo.setCompnayIds(compnayIds); staffStatisticsBo.setCompnayIds(compnayIds);
staffStatisticsBo.setCompanyNames(companyNames.stream().distinct().collect(Collectors.toList())); staffStatisticsBo.setCompanyNames(companyNames.stream().distinct().collect(Collectors.toList()));
staffStatisticsBo.setPostionIds(postionIds); staffStatisticsBo.setPostionIds(postionIds);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment