待结算

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

@@ -10,7 +10,8 @@
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
-                AND status='待结算'
+                AND status='待结算'  and( approve_status= ''
+                or approve_status is null)
             </if>
             <if test="searchType == 3">
                 AND actual_collectionment-amount_ed_collectionable>0
@@ -89,12 +90,14 @@
         status,
         approve_status as approveStatus,
         status_flag as statusFlag,
+        update_date as updateDate,
         workflow_id as workflowId
         FROM payment_management
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
-                AND status='待结算'
+                AND status='待结算'  and( approve_status= ''
+                or approve_status is null)
             </if>
             <if test="searchType == 3">
                 AND actual_collectionment-amount_ed_collectionable>0