1.优化手持盘点机获取盘点列表

archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java

@@ -16,6 +16,7 @@ import com.storeroom.modules.device.service.DeviceService;
 import com.storeroom.modules.device.service.DeviceSpecParamService;
 import com.storeroom.modules.device.service.dto.DeviceSpecParamDto;
 import com.storeroom.utils.ApiResponse;
+import com.storeroom.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -34,6 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -309,9 +311,18 @@ public class RFIDController {
     @ApiOperation("盘点列表")
     @AnonymousGetMapping("/initArrangeList")
     public ApiResponse<Object> initArrangeList(
-            Integer checkState, String region, String orderNo, Pageable page
+            String checkState, String region, String orderNo, Pageable page
     ){
-        return ApiResponse.success(arrangeService.initArrangeList(checkState,region,orderNo,page));
+        List<Integer> checkStates = null;
+        if(!StringUtils.isEmpty(checkState)){
+            checkStates = new ArrayList<>();
+            String[] checkSpilit = checkState.split(",");
+            for(String s : checkSpilit){
+                checkStates.add(Integer.parseInt(s));
+            }
+        }
+        return ApiResponse.success(checkStates == null?arrangeService.initArrangeList(-1,region,orderNo,page)
+                                                      :arrangeService.initArrangeList(checkStates,region,orderNo,page));
     }
 
     @ApiOperation("根据盘点单号获取盘点基本信息")

archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillRepository.java

@@ -7,6 +7,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface ArchivesCheckBillRepository extends JpaRepository<ArchivesCheckBill, String>{
 
     @Query(nativeQuery = true,
@@ -21,6 +23,11 @@ public interface ArchivesCheckBillRepository extends JpaRepository<ArchivesCheck
                     "and if(?2 is null,1=1,region like ?2) and if(?3 is null,1=1,id like ?3) ")
     Page<ArchivesCheckBill> initArrangeList(Integer checkState, String region, String orderNo, Pageable page);
 
+    @Query(nativeQuery = true,
+            value = "select * from archives_check_bill where check_state in ?1 " +
+                    "and if(?2 is null,1=1,region like ?2) and if(?3 is null,1=1,id like ?3) ")
+    Page<ArchivesCheckBill> initArrangeLists(List<Integer> checkState, String region, String orderNo, Pageable page);
+
     @Query("from ArchivesCheckBill where id = ?1 ")
     ArchivesCheckBill findBillById(String orderNo);
 

archives/src/main/java/com/storeroom/modules/archives/service/ArrangeService.java

@@ -15,6 +15,7 @@ public interface ArrangeService {
     Object addArrange(ArrangeAddDTO dto);
     //初始化盘点列表
     Object initArrangeList(Integer checkState, String region, String orderNo, Pageable page);
+    Object initArrangeList(List<Integer> checkState, String region, String orderNo, Pageable page);
     //查看盘点信息
     ArchivesCheckBill getArrange(String orderNo);
     //查看盘点单内详细信息

archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java

@@ -119,11 +119,19 @@ public class ArrangeServiceImpl implements ArrangeService {
 
     @Override
     public Object initArrangeList(Integer checkState, String region, String orderNo, Pageable page) {
+        checkState = checkState == -1 ? null : checkState;
         orderNo = StringUtils.isEmpty(orderNo) ? null : "%"+ orderNo +"%";
         region = StringUtils.isEmpty(region) ? null : "%"+ region +"%";
         return PageUtil.toPage(archivesCheckBillRepository.initArrangeList(checkState,region,orderNo,page));
     }
 
+    @Override
+    public Object initArrangeList(List<Integer> checkState, String region, String orderNo, Pageable page) {
+        orderNo = StringUtils.isEmpty(orderNo) ? null : "%"+ orderNo +"%";
+        region = StringUtils.isEmpty(region) ? null : "%"+ region +"%";
+        return PageUtil.toPage(archivesCheckBillRepository.initArrangeLists(checkState,region,orderNo,page));
+    }
+
     @Override
     public ArchivesCheckBill getArrange(String orderNo) {
         return archivesCheckBillRepository.findBillById(orderNo);