From 9aeb4600d0ca0be78df87b6db473e9a1fb0b8cac Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 15 Nov 2022 17:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=B7=A5=E5=8D=95=E7=BC=96=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SfcDispatchServiceImpl.java  |  7 +++++-
 .../resources/mapper/SfcDispatchMapper.xml    |  6 +++++
 .../meapi/controller/ShopOrderController.java | 22 +++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
index ef3ea91b..e6f270ad 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
@@ -111,7 +111,12 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     @Override
     public List<SfcDispatchDto> findSfcDispatchList(Map paramMap) throws IOException {
 
-
+        //批量查询工单编号
+        if (paramMap.containsKey("shopOrderInput")){
+            String[] shopOrderInputs = String.valueOf(paramMap.get("shopOrderInput")).split(",");
+            paramMap.put("shopOrderList",shopOrderInputs);
+            paramMap.remove("shopOrderInput");
+        }
         List<SfcDispatchDto> list = sfcDispatchMapper.findSfcDispatchList(paramMap);
         if (list == null || list.size() <= 0) {
             return list;
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index db972eeb..50652816 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -848,6 +848,12 @@
         <if test="shopOrder != null and shopOrder != ''">
             AND SD.SHOP_ORDER LIKE '%' ||#{shopOrder}|| '%'
         </if>
+        <if test="shopOrderList != null and shopOrderList.length > 0">
+            AND SD.SHOP_ORDER IN
+            <foreach collection="shopOrderList" index="index" item="shopOrderItem" open="(" separator="," close=")">
+                #{shopOrderItem}
+            </foreach>
+        </if>
         <if test="resourceType != null and resourceType != ''">
             AND SD.RESOURCE_TYPE = #{resourceType}
         </if>
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
index c1f0bd33..2e8ec139 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
@@ -105,18 +106,17 @@ public class ShopOrderController {
      * @return
      */
     @GetMapping("/findShopOrderList")
-    public R findShopOrderList(Map paramMap){
-        QueryWrapper<ShopOrder> wrapper = new QueryWrapper<>();
-        wrapper.select("SHOP_ORDER");
-        List<ShopOrder> result = shopOrderService.list();
-        ArrayList<Map<String,String>> List = new ArrayList<>();
-        for (int i = 0; i < result.size(); i++) {
-                HashMap<String, String> map = new HashMap<>();
-                map.put("shopOrderId",String.valueOf(i));
-                map.put("shopOrder",String.valueOf(result.get(i).getShopOrder()));
-                List.add(map);
+    public R findShopOrderList(@RequestParam(required = false) Map paramMap){
+        Map<String,String> map = new HashMap<>();
+        if (!StringUtils.isEmpty(String.valueOf(paramMap.get("shopOrder")))){
+            ShopOrder shopOrder = shopOrderService.findById(String.valueOf(paramMap.get("shopOrder")), null);
+            if (shopOrder == null){
+                map.put("shopOrder",null);
+            }else {
+                map.put("shopOrder",shopOrder.getShopOrder());
             }
-       return R.ok(List);
+        }
+       return R.ok(map);
     }
 
 }