feat: 问题修复项

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

feat: 问题修复项
1、设计师权重导出 2、订单列表多选
谢茂盛
1 parent 44e397b3
Showing 4 changed files with 39 additions and 6 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/resources/application.yml
@@ -58,6 +58,7 @@ public class OrderFieldUtils {
                 .productionDepartmentConsignTime(locked)
                 .productStyle(locked)
                 .projectNo(locked)
+                .businessPerson(locked)
                 .build();
     }
@@ -58,6 +58,25 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
      */
     private Integer type;
+    /**
+     * 项目号
+     */
+    private List<String> projectNo;
+
+    /**
+     * 客户编码集合
+     */
+    private List<String> customerCode;
+
+    /**
+     * 内部编号
+     */
+    private List<String> innerNo;
+
+    /**
+     * 生产科
+     */
+    private List<String> productionDepartment;
 }
@@ -30,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -304,12 +301,28 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         if (!resultVO.getIsAdmin()) {
             queryVO.setApplyUserId(Objects.nonNull(resultVO.getUserVO()) ? resultVO.getUserVO().getId() : -1);
         }
+        Set<Long> orderIds = new HashSet<>();
+        if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
+                || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
+            List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo()));
+            if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
+                orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+            } else {
+                orderIds.add(-1L);
+            }
+        }
         return new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId())
                 .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
                 .eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType())
-                .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList());
+                .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
+                .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
     }
     /**
@@ -3,4 +3,4 @@ server:
 spring:
   profiles:
-    active: prod
 \ No newline at end of file
+    active: local
 \ No newline at end of file