feature 1.认证查询接口改造

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

@@ -130,6 +130,16 @@ public class BaseInvoiceController extends AbstractController {
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
         Map<String, Object> pramsMap = new HashMap<>(25);
+
+        pramsMap.put("qszt", map.get("qszt"));
+        pramsMap.put("wrzfpStart", map.get("wrzfpStart"));
+        pramsMap.put("wrzfpEnd", map.get("wrzfpEnd"));
+        pramsMap.put("imageNumber", map.get("imageNumber"));
+        pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
+        pramsMap.put("postingTimeEnd", map.get("postingTimeEnd"));
+        pramsMap.put("accountPeriodStart", map.get("accountPeriodStart"));
+        pramsMap.put("accountPeriodEnd", map.get("accountPeriodEnd"));
+        pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("company", map.get("company"));
         pramsMap.put("menuId", map.get("menuId"));
         pramsMap.put("xfmc", xfmc);

dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java

@@ -466,4 +466,14 @@ public class BaseTDxRecordInvoice implements Serializable {
     private String inAccountStatus;
 
     private String invoiceSource;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private Date accountPeriod;
+    //过账时间
+    private Date postingTime;
+
+
+
 }

dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java

@@ -1,7 +1,9 @@
 package com.dxhy.base.model;
 
 import java.io.Serializable;
+import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -187,4 +189,15 @@ public class BaseFpRzRespVO implements Serializable {
 
     public BaseFpRzRespVO() {}
 
+    //凭证号 SN
+    private String snVoucherNumber;
+    //账期 SN
+    @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone="GMT+8")
+    private Date accountPeriod;
+    //过账时间 SN
+    @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone="GMT+8")
+    private Date postingTime;
+    //影像号  SN
+    private String imageNumber;
+
 }

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

@@ -60,7 +60,7 @@
         dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status,
         t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d')
         bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date,
-        voucher_number
+        voucher_number, sn_voucher_number, account_period, posting_time ,image_number
         from t_dx_record_invoice t
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq}
         
@@ -84,16 +84,31 @@
         <if test="qsfs != null and qsfs != '' and qsfs != 'null'">
             and t.qs_type = #{qsfs}
         </if>
-        <if
-                test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
+          <if test="qszt != null and qszt != '' and qszt != 'null'">
+            and t.qs_status = #{qszt}
+        </if>
+        <if test="wrzfpStart != null and wrzfpStart != '' and wrzfpStart != 'null' and wrzfpEnd != null and wrzfpEnd != '' and wrzfpEnd != 'null'">
+           and rzh_yesorno = '0' and date_format(t.invoice_date,'%Y-%m-%d') between #{wrzfpStart} and #{wrzfpEnd}
+        </if>
+       <if 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="rzksrq != null and rzksrq != '' and rzksrq != 'null' and rzjsrq != null and rzjsrq != '' and rzjsrq != 'null'">
+        <if test="rzksrq != null and rzksrq != '' and rzksrq != 'null' and rzjsrq != null and rzjsrq != '' and rzjsrq != 'null'">
             and date_format(t.rzh_date,'%Y-%m-%d') between #{rzksrq} and #{rzjsrq}
+        </if>
+         <if test="accountPeriodStart != null and accountPeriodStart != '' and accountPeriodStart != 'null'
+         and accountPeriodEnd != null and accountPeriodEnd != '' and accountPeriodEnd != 'null'">
+            and date_format(t.account_period,'%Y-%m') between #{accountPeriodStart} and #{accountPeriodEnd}
+        </if>
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null'
+        and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null'">
+            and date_format(t.posting_time,'%Y-%m-%d') between #{postingTimeStart} and #{postingTimeEnd}
         </if>
         <if test="rzzt != null and rzzt != '' and rzzt != 'null' ">
             and t.rzh_yesorno = #{rzzt}
+        </if>
+          <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' ">
+            and t.image_number = #{imageNumber}
         </if>
         <if test="rzclzt !=null and rzclzt != ''">
             and t.auth_status = #{rzclzt}
@@ -145,6 +160,9 @@
         <if
                 test="skssq != null and skssq != '' and skssq != 'null' ">
             and t.rzh_belong_date = #{skssq}
+        </if>
+         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' ">
+            and t.sn_voucher_number = #{snVoucherNumber}
         </if>
         <if
                 test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">