修改销项票池导出条件

dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml

@@ -387,8 +387,30 @@
         <if test="listMark != null and listMark != '' and listMark != 'null' and listMark != '99'">
             and t.list_status = #{listMark}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
-            and t.payment_status = #{inAccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '' or t.inaccount_status is null or t.inaccount_status = '0')
+        </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
+
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
         </if>
         <if test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
             and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}