字段修改

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -508,6 +508,7 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("position", position);
         }
 
+        //发票号码
         if (!StringUtils.isBlank(invoiceNo)) {
             if(invoiceNo.length()==8){
                 pramsMap.put("invoiceNo", invoiceNo);

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -69,8 +69,7 @@
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'
         and t.company = #{company}
-        <if
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
-                test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
             and t.invoice_status in ('0','7')
             and t.invoice_amount>0
             and t.tax_amount>=0
@@ -78,8 +77,7 @@
             and d.tj_status in('0','3')
         </if>
 
-        <if
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
-                test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
             and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount &lt;0 or t.tax_amount &lt;0 or
             date_format(t.invoice_date,'%Y%m%d') &lt;= c.select_start_date or
             date_format(t.invoice_date,'%Y%m%d') &gt;=
@@ -93,8 +91,7 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
-        <if
+        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
-                test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
         </if>
         <if test="voucherNumber != null and voucherNumber != ''">
@@ -121,8 +118,7 @@
         <if test="fpzt != null and fpzt != '' and fpzt != 'null'">
             and t.invoice_status = #{fpzt}
         </if>
-        <if
+        <if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
-                test="qsfs != null and qsfs != '' and qsfs != 'null' ">
             and t.qs_type = #{qsfs}
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
@@ -134,18 +130,15 @@
         <if test="settlementNo != null and settlementNo != ''">
             and t.settlement_no like concat(#{settlementNo},'%')
         </if>
-        <if
+        <if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
-                test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}
         </if>
         <!-- 按签收人查询 -->
-        <if
+        <if  test="position != null and position != '' and position != 'null' and position == '1'.toString()">
-                test="position != null and position != '' and position != 'null' and position == '1'.toString()">
             and t.qs_name = #{username}
         </if>
 
-        <if
+        <if test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
-                test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
             and t.dept_id = #{businessCode}
         </if>
         <if test="businessCode==''">