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

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -294,6 +294,11 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private String taxRegistrationNo;
+    /**
+     * app端传1
+     */
+    @TableField(exist = false)
+    private String pcFlag;
 
     @Override
     protected Serializable pkVal() {

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

@@ -78,6 +78,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         pageView.put("compId", paymentManagement.getCompId());
         pageView.put("searchKeyWord", paymentManagement.getSearchKeyWord());
         pageView.put("searchType", paymentManagement.getSearchType());
+        pageView.put("pcFlag", paymentManagement.getPcFlag());
         pageView.put("pageSize", paymentManagement.getPageSize());
         pageView.put("warehouseName",paymentManagement.getWarehouseName());
         pageView.put("customerPhone",paymentManagement.getCustomerPhone());

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

@@ -7,9 +7,7 @@
         SELECT
         COUNT(id)
         FROM payment_management
-        WHERE
-        comp_id = #{compId}
-        and delete_flag = '0'
+        WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_payable-amount_ed_payable>0
@@ -18,6 +16,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
+        <if test="pcFlag != null and pcFlag != ''and pcFlag == '2'">
+            AND comp_id = #{compId}
+        </if>
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
@@ -69,9 +70,7 @@
         status_flag as statusFlag,
         workflow_id as workflowId
         FROM payment_management
-        WHERE
-        comp_id = #{compId}
-        and delete_flag = '0'
+        WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_payable-amount_ed_payable>0
@@ -80,6 +79,9 @@
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
+        <if test="pcFlag != null and pcFlag != ''and pcFlag == '2'">
+            AND comp_id = #{compId}
+        </if>
         <if test="customerPhone != null and customerPhone != ''">
             AND customer_phone = #{customerPhone}
         </if>