From 8487a73d450765227497f0b34e0774e20bf593bc Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 11 Apr 2025 14:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IncomeInvoiceServiceImpl.java        | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
index 2d4c6c0e..dfbdb947 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
@@ -82,6 +82,8 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
                  JSONObject saveData = new JSONObject();
                 //3、对照数据
                 JSONObject jsonObject = datalist.getJSONObject(i);
+                JSONObject content = jsonObject.getJSONObject("content");
+
                 //发票号码
                 String fphm = jsonObject.getString("fphm");
                 if(fphm == null || "".equals(fphm) ){
@@ -114,28 +116,28 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
                 saveData.put("document_rule_num", comparisonEntityRuleGz.getDocumentRuleNum());//单据规则流水号
 
                 saveData.put("fphm",fphm);
-                saveData.put("fpdm",jsonObject.getString("fpdm"));
+                saveData.put("fpdm",content.getString("fpdm"));
                 saveData.put("kprq",jsonObject.getString("kprq"));
-                saveData.put("xfmc",jsonObject.getString("xfmc"));
-                saveData.put("gfsh",jsonObject.getString("gfsh"));
-                saveData.put("gfmc",jsonObject.getString("gfmc"));
-                saveData.put("hjje",jsonObject.getString("hjje"));
-                saveData.put("hjse",jsonObject.getString("hjse"));
-                saveData.put("jshj",jsonObject.getString("jshj"));
-                saveData.put("jym",jsonObject.getString("jym"));
-                saveData.put("xfdzdh",jsonObject.getString("xfdzdh"));
-                saveData.put("xfyhzh",jsonObject.getString("xfyhzh"));
-                saveData.put("gfdzdh",jsonObject.getString("gfdzdh"));
-                saveData.put("gfyhzh",jsonObject.getString("gfyhzh"));
-                saveData.put("mmq",jsonObject.getString("mmq"));
-                saveData.put("bz",jsonObject.getString("bz"));
-                saveData.put("jqbh",jsonObject.getString("jqbh"));
-                saveData.put("jdhm",jsonObject.getString("jdhm"));
-                saveData.put("kpr",jsonObject.getString("kpr"));
-                saveData.put("skr",jsonObject.getString("skr"));
-                saveData.put("fhr",jsonObject.getString("fhr"));
+                saveData.put("xfsh",content.getString("xfsh"));
+                saveData.put("xfmc",content.getString("xfmc"));
+                saveData.put("gfsh",content.getString("gfsh"));
+                saveData.put("gfmc",content.getString("gfmc"));
+                saveData.put("hjje",content.getString("hjje"));
+                saveData.put("hjse",content.getString("hjse"));
+                saveData.put("jshj",content.getString("jshj"));
+                saveData.put("jym",content.getString("jym"));
+                saveData.put("xfdzdh",content.getString("xfdzdh"));
+                saveData.put("xfyhzh",content.getString("xfyhzh"));
+                saveData.put("gfdzdh",content.getString("gfdzdh"));
+                saveData.put("gfyhzh",content.getString("gfyhzh"));
+                saveData.put("mmq",content.getString("mmq"));
+                saveData.put("bz",content.getString("bz"));
+                saveData.put("jqbh",content.getString("jqbh"));
+                saveData.put("jdhm",content.getString("jdhm"));
+                saveData.put("kpr",content.getString("kpr"));
+                saveData.put("skr",content.getString("skr"));
+                saveData.put("fhr",content.getString("fhr"));
 
-                JSONObject content = jsonObject.getJSONObject("content");
                 JSONArray detaildata = content.getJSONArray("items");
                 if(detaildata != null && detaildata.size() > 0){
                     for (int i1 = 0; i1 < detaildata.size(); i1++) {
@@ -208,8 +210,8 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         JSONObject queryParams = new JSONObject();
         queryParams.put("page",queryCursor);
         queryParams.put("size",size);
-        queryParams.put("kprqq",dataTime);
-        queryParams.put("kprqz",dataTime);
+        //queryParams.put("kprqq",dataTime);
+        //queryParams.put("kprqz",dataTime);
         queryParams.put("taxNo",taxNo);
         dayabody.put("queryParams",queryParams);
         Map<String, Object> parametersMap = new HashMap<>();