From cf8a99b9ecf91c6cad9943b8d40a7e102ed775d6 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 21 Apr 2023 14:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/controller/BaseInvoiceController.java  | 9 +++++++--
 .../main/java/com/dxhy/base/model/BaseFpRzRespVO.java    | 2 +-
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml   | 7 ++++---
 .../extend/service/companypool/TicketServiceImpl.java    | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index f3d4db7b..fec07405 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -138,8 +138,13 @@ public class BaseInvoiceController extends AbstractController {
         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"));
+        if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
+            String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
+//        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"));
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
index ea4f5d11..f3b2f9b6 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
@@ -199,7 +199,7 @@ public class BaseFpRzRespVO implements Serializable {
     private String accountPeriod;
     //过账时间 SN
     @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone="GMT+8")
-    private Date postingTime;
+    private String postingTime;
     //影像号  SN
     private String imageNumber;
     private String imageId;
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 2362edf9..2909d2bd 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -15,6 +15,7 @@
         <result column="image_id" property="imageNumber"/>
         <result column="gfmc" property="gfmc"/>
         <result column="gf_tax_no" property="gfsh"/>
+        <result column="account_period" property="accountPeriod"/>
         <result column="gf_name" property="gfmc"/>
         <result column="rzh_date" property="rzsj"/>
         <result column="xf_tax_no" property="xfsh"/>
@@ -57,10 +58,10 @@
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="mysql">
         select
-        t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no,t.gf_name,t.image_id,t.rzh_date,
+        t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no,t.gf_name,t.image_id,
         t.dept_id deptId,t.dept_name deptName,
-        t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d')
-        rzh_date,date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id,
+        t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date,
+        date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id,
         t.gx_user_name,t.rzh_belong_date
         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')
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
index b1f4dd85..ef0a0b73 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
@@ -44,7 +44,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
 
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "xfName",
                 "passenger", "passengerSfzh", "trainNumber", "invoiceAmount", "qsStatus",
-                "qsDate", "qsType", "qsName", "isDeduction", "businessDocumentNumber", "createDate","voucherNumber", "postingTime","imageId","accountPeriod"};
+                "qsDate", "qsType", "qsName", "isDeduction", "businessDocumentNumber", "createDate","snVoucherNumber", "postingTime","imageId","accountPeriod"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);