Merge branch 'staff-statistics' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/StaffStatisticsBo.java

@@ -23,6 +23,7 @@ public class StaffStatisticsBo {
 
     private static final long serialVersionUID = 1L;
     private String name ;
+    private Integer userId;
     private List<String> companyNames;
     private List<Integer> compnayIds;
     private List<String> postionNames;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/StaffStatisticsFindDTO.java

@@ -23,4 +23,6 @@ public class StaffStatisticsFindDTO  extends PageParam {
     private String companyName;
     private Integer userPostionId;
     private Integer companyId;
+    private List<Integer> userIds;
+    private Boolean isExport;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java

@@ -77,8 +77,7 @@ public class StaffStatisticsBiz {
             //3.根据订单id查询订单相关信息
             List<Integer> orderIds = appUserSellingWaterDTOS.stream().map(AppUserSellingWaterDTO::getOrderId).collect(Collectors.toList());
             ObjectRestResponse<List<OrderDTO>> response =orderFeign.findOrdersByorderId(orderIds);
-            List<OrderDTO> orders = CollUtil.newArrayList();
-                    //response.getData();
+            List<OrderDTO> orders =response.getData();
             Map<Integer, Integer> ordersMap = orders.stream().collect(Collectors.toMap(OrderDTO::getId, OrderDTO::getCompanyId));
             for (AppUserSellingWaterDTO appUserSellingWaterDTO : appUserSellingWaterDTOS) {
                 appUserSellingWaterDTO.setCompanyId(ordersMap.get(appUserSellingWaterDTO.getOrderId()) == null ? NO_COMPANY_STATE : ordersMap.get(appUserSellingWaterDTO.getOrderId()));
@@ -220,6 +219,7 @@ public class StaffStatisticsBiz {
             staffStatisticsBo.setPostionNames(Arrays.asList(userStaffBo.getPostionName()));
             staffStatisticsBo.setPostionIds(Arrays.asList(userStaffBo.getPostionId()));
         }
+        staffStatisticsBo.setUserId(userStaffBo.getUserId());
         staffStatisticsBo.setName(StringUtils.hasText(userStaffBo.getRealName())?userStaffBo.getRealName():userStaffBo.getNickName());
         staffStatisticsBo.setPhone(userStaffBo.getPhone());
         staffStatisticsBo.setMemberAmount(BigDecimal.ZERO);