From 06488e1188e6cb4d0bb306f65527b61ea7d3bc04 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Wed, 11 Jan 2023 10:03:03 +0800
Subject: [PATCH] 2

---
 .../portal/biz/gdinstorage/GdInstorageCountService.java         | 2 +-
 .../biz/purchaserequisition/PurchaseRequisitionMapper.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java
index 10d0a319..2e85d94b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java
@@ -215,7 +215,7 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
             int size4 = list4.size();
             int countRow4 = size4 + 3;
             double ccddspjz = 0, cccolq16 = 0, ccztprodValue1 = 0, ccztprodValue2 = 0;
-            for (int y = 3; y < countRow2; y++) {
+            for (int y = 3; y < countRow4; y++) {
                 Map<String, Object> map = list4.get(y - 3);
 
                 writer.writeCellValue(0, y, "市烟草");
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
index 154b017d..ee33b31c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
@@ -42,7 +42,7 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     @Select("SELECT MAX(sbi.name) name,code,SUM(packageTotalPrice) billTotalPrice,MAX(purchaseDate) billDate,MAX(arrivalDate) arrivalDate FROM `purchase_requisition` pr " +
             "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " +
             "LEFT JOIN `supplier_bank_info` sbi ON sbi.codeUnified=pr.`supplierOnlyCode`  " +
-            " WHERE pr.purchaseState=1 AND pr.bankState=1 " +
+            " WHERE pr.purchaseState=1 AND pr.bankState=1 AND pr.supplierOnlyCode IN(SELECT codeUnified FROM `supplier_bank_info` WHERE purchaseRequisition=1 AND bankstate=1)" +
             " GROUP BY pr.supplierOnlyCode,CODE ORDER BY sbi.name;")
     List<Map<String, String>> gysddmxb();