Browse Source

包材厂下拉框查询入参添加是否一级包材厂的筛选条件

v_HuilingDeng 3 years ago
parent
commit
f6549597b4

+ 3 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListFactorySelectReq.java

@@ -24,4 +24,7 @@ public class ListFactorySelectReq implements Serializable {
     @ApiModelProperty(value = "是否数据隔离")
     @ApiModelProperty(value = "是否数据隔离")
     private Integer dataLimit;
     private Integer dataLimit;
 
 
+    @ApiModelProperty(value = "是否一级包材厂")
+    private Integer isFirstFactory;
+
 }
 }

+ 4 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -306,6 +307,9 @@ public class FactoryServiceImpl implements FactoryService {
         if(DataLimitEnum.YES.is(req.getDataLimit())){
         if(DataLimitEnum.YES.is(req.getDataLimit())){
             param.eq("id", userUtil.getWholeUser().getFactoryId());
             param.eq("id", userUtil.getWholeUser().getFactoryId());
         }
         }
+        if(req.getFactoryTypeList().contains(FactoryTypeEnum.COVER.getCode()) && Objects.nonNull(req.getIsFirstFactory())){
+            param.eq("is_first_factory", req.getIsFirstFactory());
+        }
         //其他条件
         //其他条件
         param.in("factory_type", req.getFactoryTypeList());
         param.in("factory_type", req.getFactoryTypeList());
         param.eq("is_delete", 0);
         param.eq("is_delete", 0);