From 9d03a75b51c2f460ba8a1089a16cd4eff86a679d Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 25 Apr 2023 12:57:03 +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

---
 .../model/dto/TdxExportCustomsModelDTO.java        |  4 ++++
 .../extend/controller/ExtFpzhcxController.java     | 14 ++++++++++++++
 .../com/dxhy/extend/model/ExtBbycfpcxRespVO.java   |  6 +++++-
 .../service/bb/impl/ExtYcfpcxServiceImpl.java      |  4 ++--
 .../main/resources/mapper/ExtBbycfpcxMapper.xml    | 10 +++++-----
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java
index 337a3f0e..e49b7477 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java
@@ -51,6 +51,10 @@ public class TdxExportCustomsModelDTO extends CommonDTO {
     private String entryDiscrepancy;
     private String bzdh;
     private String inAccountStatus;
+    private String snVoucherNumber;
+    private String imageNumber;
+    private String postingTime;
+    private String accountStatus;
 
     public void setParam(Page page, UserInfo userInfo) throws Exception {
 
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
index 6ab31378..6b149d35 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
@@ -266,6 +266,20 @@ public class ExtFpzhcxController extends AbstractController {
         data.put("company", pramsMap.get("company"));
         data.put("menuId", pramsMap.get("menuId"));
         data.put("imageNumber",pramsMap.get("imageNumber"));
+        data.put("snVoucherNumber",pramsMap.get("snVoucherNumber"));
+        if(pramsMap.get("postingTimeStart") != null && !"".equals(pramsMap.get("postingTimeStart"))){
+            data.put("postingTimeStart",DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("postingTimeStart").toString())));
+        }
+        if(pramsMap.get("postingTimeEnd") != null && !"".equals(pramsMap.get("postingTimeEnd"))){
+            data.put("postingTimeEnd",DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("postingTimeEnd").toString())));
+        }
+
+        if (pramsMap.get("accountPeriod") != null && !"".equals(pramsMap.get("accountPeriod"))) {
+            String accountPeriod = (String) pramsMap.get("accountPeriod");
+            accountPeriod = accountPeriod.substring(0,7);
+            data.put("accountPeriod",accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
         try {
             return ResponseEntity.ok(R.ok().put("data", ycfpcxService.selectByPramsMap(data, curr, size)));
         } catch (Exception e) {
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java
index 0945c30f..4491d1a0 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java
@@ -108,8 +108,12 @@ public class ExtBbycfpcxRespVO implements Serializable {
     private String skssq;
 
     private String businessName;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
+    private String snVoucherNumber;
+    private String imageNumber;
+    private String accountPeriod;
+    private String postingTime;
 
     public ExtBbycfpcxRespVO() {}
 
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
index 7a119c3e..6bbb932e 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
@@ -105,8 +105,8 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
                     pageList.get(i).setRzzt(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzzt));
                     String rzlx = pageList.get(i).getRzlx();
                     pageList.get(i).setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, rzlx));
-                    String inAccountStatus = pageList.get(i).getInaccountStatus();
-                    pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
+                    String inAccountStatus = pageList.get(i).getInAccountStatus();
+                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
 
                     // if (rzlxModels!=null){
                     // for (DictdetaModel model : rzlxModels){
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
index fc347227..004a1aa5 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
@@ -5,7 +5,7 @@
 
     <resultMap id="BaseResultMap"
                type="com.dxhy.extend.model.ExtBbycfpcxRespVO">
-        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="bzdh" property="bzdh"/>
         <result column="fpdm" property="fpdm"/>
         <result column="fphm" property="fphm"/>
@@ -60,8 +60,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
                 test="yczt != null and yczt != '' and yczt != 'null' ">
@@ -167,8 +167,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
                 test="yczt != null and yczt != '' and yczt != 'null' ">