Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -153,6 +153,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         pageView.put("invoicing", paymentManagement.getInvoicing());
         pageView.put("appFlag", paymentManagement.getAppFlag());
         pageView.put("warehouseName", paymentManagement.getWarehouseName());
+        pageView.put("goodsName", paymentManagement.getGoodsName());
         pageView.put("customerPhone", paymentManagement.getCustomerPhone());
         pageView.put("contractNo", paymentManagement.getContractNo());
         pageView.put("currentPage", paymentManagement.getCurrentPage());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -53,6 +53,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND a.warehouse_name= #{warehouseName}
         </if>
+        <if test="goodsName != null and goodsName != ''">
+            AND a.goods_name= #{goodsName}
+        </if>
         <if test="appFlag != null and appFlag != ''">
             AND (a.comp_id = '2710b21efc1e4393930c5dc800010dc4'
             OR a.comp_id = '7e07faa792e14a4da4eb6fad8b4839e1')
@@ -199,6 +202,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND a.warehouse_name= #{warehouseName}
         </if>
+        <if test="goodsName != null and goodsName != ''">
+            AND a.goods_name= #{goodsName}
+        </if>
         <if test="appFlag != null and appFlag != ''">
             AND (a.comp_id = '2710b21efc1e4393930c5dc800010dc4'
             OR a.comp_id = '7e07faa792e14a4da4eb6fad8b4839e1')