From 2eda17a59922f3e625f39a08aae777373b1b8462 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 22 May 2023 15:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=B0=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/controller/BaseInvoiceController.java  | 9 +++------
 .../java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java  | 2 ++
 .../tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java | 2 ++
 .../BaseRzTDxRecordInvoiceServiceImpl.java               | 5 +++++
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 8 ++++++++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 46497e5f..cc82820d 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -1279,16 +1279,13 @@ public class BaseInvoiceController extends AbstractController {
         List<String> uuidList = Arrays.asList(uuidArray);
 
         //查询库中是否包含对应数据
-        QueryWrapper<BaseTDxRecordInvoice> queryWrap = new QueryWrapper<>();
-        queryWrap.in("uuid",uuidList);
-
         DynamicContextHolder.push("business"+ DbConstant.BUSINESS_READ);
-        List<BaseTDxRecordInvoice> list = baseIRzTDxRecordInvoiceService.list(queryWrap);
+        List<String> list = baseIRzTDxRecordInvoiceService.findSuspendStatus(uuidList);
         if (list == null || list.isEmpty()){
             return ResponseEntity.ok(R.error("没有可操作的数据"));
         }
-        List<String> suspendTypes = list.stream().map(BaseTDxRecordInvoice::getSuspendStatus).collect(Collectors.toList());
-        if (suspendTypes.contains("1")&& (suspendTypes.contains("0")||suspendTypes.contains(null) || suspendTypes.contains(""))){
+
+        if (list.contains("1")&& (list.contains("0")||list.contains(null) || list.contains(""))){
             return ResponseEntity.ok(R.error("同时存在暂挂状态为是和否的数据，请重新选择！"));
         }
 
diff --git a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java
index d09f3e73..3d808fa7 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java
@@ -216,4 +216,6 @@ public interface BaseTDxRecordInvoiceDao extends BaseMapper<BaseTDxRecordInvoice
     List<BaseTDxRecordInvoice> selectInTellingCheck(Map<String, Object> pramsMap);
 
     void updateSuspendType(Map<String,Object> pramsMap);
+
+    List<String> findSuspendStatus(List<String> uuids);
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java
index 92599be8..1a9a06a4 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java
@@ -71,4 +71,6 @@ public interface BaseIRzTDxRecordInvoiceService extends MpBaseService<BaseTDxRec
     String identifiAllCount(Map<String, Object> pramsMap);
 
     String updateSuspendType(Map<String,Object> pramsMap);
+
+    List<String> findSuspendStatus(List<String> uuidList);
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
index 70da7d43..ad633f7f 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
@@ -441,6 +441,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         return "操作成功";
     }
 
+    @Override
+    public List<String> findSuspendStatus(List<String> uuidList) {
+        return super.baseMapper.findSuspendStatus(uuidList);
+    }
+
     @Override
     public String identifiByAll(Map<String, Object> pramsMap) {
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index e60bee2e..7d7f452f 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1422,4 +1422,12 @@
             #{uuid}
         </foreach>
     </update>
+
+    <select id="findSuspendStatus" parameterType="java.lang.String" resultType="java.lang.String">
+        select suspend_status from t_dx_record_invoice
+        where uuid in
+        <foreach collection="uuids" item="uuid" index="index" open="(" separator="," close=")">
+            #{uuid}
+        </foreach>
+    </select>
 </mapper>