From 6308f4da57c399647ed48c6dc4ffb8dc6d9baef6 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 21 May 2025 17:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E6=8A=A5=E4=BB=A3=E7=A0=81=E7=BC=96?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IncomeInvoiceServiceImpl.java        | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 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 523129b0..c32c094d 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
@@ -1052,7 +1052,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         setDataToArray("应付票据",dydata.getString("AM10187"),dydata.getString("AM10186"),reportSubjects1);
         setDataToArray("应收账款",dydata.getString("AM10171"),dydata.getString("AM10170"),reportSubjects1);
         setDataToArray("应付账款",dydata.getString("AM10169"),dydata.getString("AM10168"),reportSubjects1);
-        setDataToArray("减：坏账准备",dydata.getString("AM10153"),dydata.getString("AM10152"),reportSubjects1);
+        setDataToArray("减：坏账准备1",dydata.getString("AM10153"),dydata.getString("AM10152"),reportSubjects1);
         setDataToArray("预收款项",dydata.getString("AM10151"),dydata.getString("AM10150"),reportSubjects1);
         setDataToArray("预付款项",dydata.getString("AM10135"),dydata.getString("AM10134"),reportSubjects1);
         setDataToArray("合同负债",dydata.getString("AM10133"),dydata.getString("AM10132"),reportSubjects1);
@@ -1062,7 +1062,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         setDataToArray("应交税费",dydata.getString("AM10097"),dydata.getString("AM10096"),reportSubjects1);
         setDataToArray("其他应收款",dydata.getString("AM10081"),dydata.getString("AM10080"),reportSubjects1);
         setDataToArray("应付利息",dydata.getString("AM10079"),dydata.getString("AM10078"),reportSubjects1);
-        setDataToArray("减：坏账准备",dydata.getString("AM10063"),dydata.getString("AM10062"),reportSubjects1);
+        setDataToArray("减：坏账准备2",dydata.getString("AM10063"),dydata.getString("AM10062"),reportSubjects1);
         setDataToArray("应付股利",dydata.getString("AM10061"),dydata.getString("AM10060"),reportSubjects1);
         setDataToArray("存货",dydata.getString("AM10048"),dydata.getString("AM10047"),reportSubjects1);
         setDataToArray("其他应付款",dydata.getString("AM10046"),dydata.getString("AM10045"),reportSubjects1);
@@ -1082,7 +1082,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         setDataToArray("递延收益",dydata.getString("AM10162"),dydata.getString("AM10161"),reportSubjects1);
         setDataToArray("递延所得税负债",dydata.getString("AM10144"),dydata.getString("AM10143"),reportSubjects1);
         setDataToArray("固定资产",dydata.getString("AM10202"),dydata.getString("AM10200"),reportSubjects1);
-        setDataToArray("减：累计折旧",dydata.getString("AM10184"),dydata.getString("AM10182"),reportSubjects1);
+        setDataToArray("减：累计折旧1",dydata.getString("AM10184"),dydata.getString("AM10182"),reportSubjects1);
         setDataToArray("减：固定资产减值准备",dydata.getString("AM10166"),dydata.getString("AM10164"),reportSubjects1);
         setDataToArray("在建工程",dydata.getString("AM10148"),dydata.getString("AM10146"),reportSubjects1);
         setDataToArray("实收资本（或股本）",dydata.getString("AM10054"),dydata.getString("AM10053"),reportSubjects1);
@@ -1091,7 +1091,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         setDataToArray("资本公积",dydata.getString("AM10354"),dydata.getString("AM10352"),reportSubjects1);
         setDataToArray("使用权资产",dydata.getString("AM10058"),dydata.getString("AM10056"),reportSubjects1);
         setDataToArray("减：库存股",dydata.getString("AM10339"),dydata.getString("AM10337"),reportSubjects1);
-        setDataToArray("减：累计折旧",dydata.getString("AM10043"),dydata.getString("AM10041"),reportSubjects1);
+        setDataToArray("减：累计折旧2",dydata.getString("AM10043"),dydata.getString("AM10041"),reportSubjects1);
         setDataToArray("减：使用权资产减值准备",dydata.getString("AM10028"),dydata.getString("AM10026"),reportSubjects1);
         setDataToArray("盈余公积",dydata.getString("AM10309"),dydata.getString("AM10307"),reportSubjects1);
         setDataToArray("无形资产",dydata.getString("AM10013"),dydata.getString("AM10011"),reportSubjects1);
@@ -1152,30 +1152,30 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         setDataToArray("支付给职工以及为职工支付的现金",dydata.getString("AM10124"),qndata.getString("AM10124"),reportSubjects3);
         setDataToArray("支付的各项税费",dydata.getString("AM10106"),qndata.getString("AM10106"),reportSubjects3);
         setDataToArray("支付的其他与经营活动有关的现金",dydata.getString("AM10088"),qndata.getString("AM10088"),reportSubjects3);
-        setDataToArray("现金流出小计",dydata.getString("AM10052"),qndata.getString("AM10052"),reportSubjects3);
+        setDataToArray("现金流出小计1",dydata.getString("AM10052"),qndata.getString("AM10052"),reportSubjects3);
         setDataToArray("经营活动产生的现金流量净额",dydata.getString("AM10022"),qndata.getString("AM10022"),reportSubjects3);
         setDataToArray("收回投资所收到的现金",dydata.getString("AM10353"),qndata.getString("AM10353"),reportSubjects3);
         setDataToArray("取得投资收益所收到的现金",dydata.getString("AM10338"),qndata.getString("AM10338"),reportSubjects3);
         setDataToArray("处置固定资产、无形资产和其他长期资产所收回的现金净额",dydata.getString("AM10323"),qndata.getString("AM10323"),reportSubjects3);
         setDataToArray("处置子公司及其他营业单位收到的现金净额",dydata.getString("AM10308"),qndata.getString("AM10308"),reportSubjects3);
         setDataToArray("收到的其他与投资活动有关的现金",dydata.getString("AM10293"),qndata.getString("AM10293"),reportSubjects3);
-        setDataToArray("现金流入小计",dydata.getString("AM10277"),qndata.getString("AM10277"),reportSubjects3);
+        setDataToArray("现金流入小计1",dydata.getString("AM10277"),qndata.getString("AM10277"),reportSubjects3);
         setDataToArray("购建固定资产、无形资产和其他长期资产所支付的现金",dydata.getString("AM10253"),qndata.getString("AM10253"),reportSubjects3);
         setDataToArray("投资所支付的现金",dydata.getString("AM10231"),qndata.getString("AM10231"),reportSubjects3);
         setDataToArray("取得子公司及其他营业单位收到的现金净额",dydata.getString("AM10209"),qndata.getString("AM10209"),reportSubjects3);
         setDataToArray("其他与投资有关",dydata.getString("AM10191"),qndata.getString("AM10191"),reportSubjects3);
-        setDataToArray("现金流出小计",dydata.getString("AM10173"),qndata.getString("AM10173"),reportSubjects3);
+        setDataToArray("现金流出小计2",dydata.getString("AM10173"),qndata.getString("AM10173"),reportSubjects3);
         setDataToArray("投资活动产生的现金流量净额",dydata.getString("AM10155"),qndata.getString("AM10155"),reportSubjects3);
         setDataToArray("吸收投资所收到的现金",dydata.getString("AM10119"),qndata.getString("AM10119"),reportSubjects3);
         setDataToArray("子公司吸收少数股东投资收到的现金",dydata.getString("AM10101"),qndata.getString("AM10101"),reportSubjects3);
         setDataToArray("借贷所收到现金",dydata.getString("AM10083"),qndata.getString("AM10083"),reportSubjects3);
         setDataToArray("发行债券收到的现金",dydata.getString("AM10065"),qndata.getString("AM10065"),reportSubjects3);
         setDataToArray("收到的其他与筹资活动有关的现金",dydata.getString("AM10050"),qndata.getString("AM10050"),reportSubjects3);
-        setDataToArray("现金流入小计",dydata.getString("AM10035"),qndata.getString("AM10035"),reportSubjects3);
+        setDataToArray("现金流入小计2",dydata.getString("AM10035"),qndata.getString("AM10035"),reportSubjects3);
         setDataToArray("偿还债务所支付的现金",dydata.getString("AM10020"),qndata.getString("AM10020"),reportSubjects3);
         setDataToArray("分配股利、利润、偿付利息所支付的现金",dydata.getString("AM10005"),qndata.getString("AM10005"),reportSubjects3);
         setDataToArray("支付的其他与筹资活动有关的现金",dydata.getString("AM10350"),qndata.getString("AM10350"),reportSubjects3);
-        setDataToArray("现金流出小计",dydata.getString("AM10335"),qndata.getString("AM10335"),reportSubjects3);
+        setDataToArray("现金流出小计3",dydata.getString("AM10335"),qndata.getString("AM10335"),reportSubjects3);
         setDataToArray("筹资活动产生的现金流量净额",dydata.getString("AM10320"),qndata.getString("AM10320"),reportSubjects3);
         setDataToArray("四、汇率变动对现金流量的影响",dydata.getString("AM10305"),qndata.getString("AM10305"),reportSubjects3);
         setDataToArray("五、现金及现金等价物净增加额",dydata.getString("AM10290"),qndata.getString("AM10290"),reportSubjects3);
@@ -1223,6 +1223,12 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
             jsonObject.put("value",new BigDecimal(value));
             jsonObject.put("valueType",1);
             reportSubjects.add(jsonObject);
+        }else {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("subjectName",subjectName);
+            jsonObject.put("value",BigDecimal.ZERO);
+            jsonObject.put("valueType",1);
+            reportSubjects.add(jsonObject);
         }
         if(value2 != null && !"".equals(value2)){
             JSONObject jsonObject = new JSONObject();
@@ -1230,6 +1236,12 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
             jsonObject.put("value",new BigDecimal(value2));
             jsonObject.put("valueType",2);
             reportSubjects.add(jsonObject);
+        }else {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("subjectName",subjectName);
+            jsonObject.put("value",BigDecimal.ZERO);
+            jsonObject.put("valueType",2);
+            reportSubjects.add(jsonObject);
         }
     }
 }