From 5788eacf85a2fecbc982746ec840b0adc2eb786c Mon Sep 17 00:00:00 2001 From: xia Date: Tue, 13 Sep 2022 14:44:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=89=8B=E6=8C=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=9C=BA=E8=8E=B7=E5=8F=96=E7=9B=98=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/controller/RFIDController.java | 15 +++++++++++++-- .../repository/ArchivesCheckBillRepository.java | 7 +++++++ .../modules/archives/service/ArrangeService.java | 1 + .../archives/service/impl/ArrangeServiceImpl.java | 8 ++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java index d200788..0fde49b 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java +++ b/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 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 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("根据盘点单号获取盘点基本信息") diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillRepository.java index 49e90a3..1819bd0 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillRepository.java +++ b/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{ @Query(nativeQuery = true, @@ -21,6 +23,11 @@ public interface ArchivesCheckBillRepository extends JpaRepository 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 initArrangeLists(List checkState, String region, String orderNo, Pageable page); + @Query("from ArchivesCheckBill where id = ?1 ") ArchivesCheckBill findBillById(String orderNo); diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArrangeService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArrangeService.java index 75eb22b..4f21087 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/ArrangeService.java +++ b/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 checkState, String region, String orderNo, Pageable page); //查看盘点信息 ArchivesCheckBill getArrange(String orderNo); //查看盘点单内详细信息 diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java index cb9a484..0265e1e 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java +++ b/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 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);