From 3727443bf165348c84f601b1488d7eb8ea554efe Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Thu, 10 Aug 2023 15:12:13 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=98=93=E8=A1=8C=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/OrderInfoServiceImpl.java | 9 +++++++++
 .../resources/mybatis/mapper/OrderProcessInfoMapper.xml  | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
index fe51f94a..1aa5d238 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@@ -2125,6 +2125,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 //根据报账单号查询未开发票数，且有效 param：发票请求流水号集合，是否需要添加来源校验
                 orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params), Arrays.asList(nsrsbh));
                 //按照报账单分组统计
+                if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
+                    return R.error("根据报账单号未查询到数据");
+                }
                 collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh()));
                 Map<String, List<String>> collect1 = Arrays.stream(params.split(",")).collect(Collectors.groupingBy(t -> t));
                 StringBuffer sb = new StringBuffer();
@@ -2144,6 +2147,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 //AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' )
                 List<String> paramList = Arrays.asList(params);
                 orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByFpqqlshs(paramList, Arrays.asList(nsrsbh));
+                if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
+                    return R.error("根据报账单号未查询到数据");
+                }
                 collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh()));
                 StringBuffer sb1 = new StringBuffer();
                 List<String> fpqqlsh = new ArrayList<>();
@@ -2187,6 +2193,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                     return "('" + split[0] + "','" + split[1] + "')";
                 }).collect(Collectors.toList());
                 orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByYFpdmHm(yFpdmHm, Arrays.asList(nsrsbh));
+                if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
+                    return R.error("根据报账单号未查询到数据");
+                }
                 collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh()));
                 StringBuffer sb2 = new StringBuffer();
                 List<String> yfpqqlsh = new ArrayList<>();
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
index 363afe8e..c7d987aa 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
@@ -179,7 +179,10 @@
         order_process_info op
         WHERE
         <if test="bzdhs != null and bzdhs.size() == 1">
-           bzdh = #{bzdhs,jdbcType=VARCHAR}
+           bzdh =
+            <foreach collection="bzdhs" index="index" item="bzdh">
+                #{bzdh,jdbcType=VARCHAR}
+            </foreach>
         </if>
         <if test="bzdhs != null and bzdhs.size() > 1">
             bzdh in