122 - 【货款账单】未过滤未审核通过的数据

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -403,6 +403,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         query.eq(ObjectUtil.isNotEmpty(purchaseDto.getSupplyId()), "pu.supply_id", purchaseDto.getSupplyId());
         query.eq(ObjectUtil.isNotEmpty(purchaseDto.getPayStatus()), "pu.pay_status", purchaseDto.getPayStatus());
         query.like(StringUtils.isNotEmpty(purchaseDto.getKeyword()), "pu.code", purchaseDto.getKeyword());
+        query.eq("pu.purchase_status", PurchaseStatusEnum.PASS.getKey());
         query.groupBy("pu.id");
         //查询采购信息与已收发票
         Page<PurchaseDto> page = baseMapper.paymentBill(purchaseDto.getPage(), query);

hx-purchase/src/main/resources/mapper/purchase/PurchaseMapper.xml

@@ -7,20 +7,19 @@
         from purchase p
             ${ew.customSqlSegment}
     </select>
+
     <select id="paymentBill" resultType="com.fjhx.purchase.entity.purchase.dto.PurchaseDto">
-        SELECT
-            pu.code,
-            pu.supply_id,
-            bs.`name` supplyName,
-            pu.amount,
-            IFNULL(SUM(nd.money),0) invoiceAmount,
-            pu.pay_status  payStatus,
-            pu.currency,
-            pu.id
-        FROM
-            purchase pu
-                LEFT JOIN bytesailing_supply.supplier_info bs ON pu.supply_id = bs.id
-                LEFT JOIN  invoice_details nd on pu.id = nd.purchase_id
+        SELECT pu.code,
+               pu.supply_id,
+               bs.`name`                supplyName,
+               pu.amount,
+               IFNULL(SUM(nd.money), 0) invoiceAmount,
+               pu.pay_status            payStatus,
+               pu.currency,
+               pu.id
+        FROM purchase pu
+                 LEFT JOIN bytesailing_supply.supplier_info bs ON pu.supply_id = bs.id
+                 LEFT JOIN invoice_details nd on pu.id = nd.purchase_id
             ${ew.customSqlSegment}
     </select>