feat: 问题修复项

1、设计师权重导出 2、订单列表多选

feat: 问题修复项
1、设计师权重导出 2、订单列表多选
谢茂盛
1 parent b249845c
Showing 3 changed files with 12 additions and 6 deletions
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
@@ -178,7 +178,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 业务员
      */
-    private String businessPerson;
+    private List<String> businessPerson;
     private List<Long> exportOrderIds;
@@ -1224,7 +1224,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         // 业务员
         if (Objects.nonNull(roleEnum) && roleEnum.getId().equals(RoleEnum.BUSINESS_USER.getId())) {
-            queryVO.setBusinessPerson(dataScope.getUser().getNickName());
+            queryVO.setBusinessPerson(Arrays.asList(dataScope.getUser().getNickName()));
         }
         if (StringUtils.isNotBlank(queryVO.getCommitUserPhone())) {
             AdminUserDO userDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
@@ -1368,7 +1368,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
                 .in(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
                 .eq(StringUtils.isNotBlank(queryVO.getCreateBy()), OrderBaseInfoDO::getCreateBy, queryVO.getCreateBy())
-                .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
+                .in(CollectionUtils.isNotEmpty(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
                 .ge(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignStartTime())
                 .le(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignEndTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignEndTime())
                 .ge(StringUtils.isNotBlank(queryVO.getOrderHodStartTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodStartTime())
@@ -27,8 +27,10 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 /**
@@ -222,10 +224,14 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
         }
         List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoService.listByIds(orderProfits.stream().map(OrderProfitAnalysisDO::getOrderId).collect(Collectors.toSet()));
         int orderTotalNum = 0;
+        Set<String> innerNoSet = new HashSet<>();
         for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOS) {
-            if (Objects.nonNull(orderBaseInfoDO.getOrderCount())) {
-                orderTotalNum += orderBaseInfoDO.getOrderCount();
+            if (!innerNoSet.contains(orderBaseInfoDO.getInnerNo())) {
+                if (Objects.nonNull(orderBaseInfoDO.getOrderCount())) {
+                    orderTotalNum += orderBaseInfoDO.getOrderCount();
+                }
             }
+            innerNoSet.add(orderBaseInfoDO.getInnerNo());
         }
         OrderProfitAnalysisVO profitAnalysisVO = new OrderProfitAnalysisVO();
         profitAnalysisVO.setPacketTotalPrice(packetTotalPrice.doubleValue());
@@ -238,7 +244,7 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
                 .packetTotalPrice(packetTotalPrice.doubleValue())
                 .customerTotalPrice(customerTotalPrice.doubleValue()).build()));
         profitAnalysisVO.setOrderTotalNum(orderTotalNum);
-        profitAnalysisVO.setRecordNum(orderProfits.size());
+        profitAnalysisVO.setRecordNum(innerNoSet.size());
         return ServerResult.success(profitAnalysisVO);
     }