From 0234240494d45d27aef81f4291d76cacd403a5e1 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 21 May 2025 10:17:10 +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

---
 .../entity/IncomeInvoiceEntity.xml            | 171 +-----------------
 .../impl/IncomeInvoiceServiceImpl.java        |  29 +--
 2 files changed, 19 insertions(+), 181 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
index d2bf5bd8..706adb7e 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
@@ -563,177 +563,10 @@
 
 
     <select id="queryAccountByZq" resultType="com.alibaba.fastjson.JSONObject"  parameterType="com.hzya.frame.plugin.incomeInvoiceData.entity.IncomeInvoiceEntity">
-        -- CREATE or replace VIEW V_LPHB_KMFZYE1 AS
-        select * from (
-        SELECT
-        year,
-        adjustperiod as period,
-        year || '-' || adjustperiod as yearperiod,
-        nt.code AS subjectCode,
-        oa.name AS subjectName,
-        oa.dispname as subjectFullName,
-        ( SELECT code FROM bd_account WHERE pk_account = nt.pid ) as superCode,
-        case
-        when balanorient = '1' then '-1'
-        when balanorient = '0' then '1'
-        end as subjectDir,
-        case
-        when pk_acctype = '0001Z01000000000019S' then 1
-        when pk_acctype = '0001Z01000000000019T' then 2
-        when pk_acctype = '0001Z01000000000019V' then 3
-        when pk_acctype = '0001Z01000000000019U' then 4
-        when pk_acctype = '0001Z01000000000019W' then 5
-        when pk_acctype = '0001Z01000000000019X' then 6
-        end as subjectType,
-        nt.sumprint_level as subjectLevel,
-        case
-        when nt.sumprint_level = '0' then 1
-        when nt.sumprint_level != '0' then 0
-        end as endLevel,
-        sum( debitamount ) AS debitValue,-- 本期借方發生額
-        sum( localcreditamount ) AS creditValue,-- 本期貸方發生額
-        CASE
-        WHEN sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) > 0 THEN'1'
-        WHEN sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) = 0 THEN'0' ELSE '-1' END AS initialSubjectDir,
-        case
-        when 	sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) )>0 then sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) )
-        else 0 end  AS initialDebitBalanceValue,	 -- 期初余额借方金额
-        case when 	sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) &lt; 0 then sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) )
-        else 0 end AS initialCreditBalanceValue,	 -- 期初余额贷方金额
-
-        CASE
-        WHEN sum( qmamount ) > 0 THEN'1'
-        WHEN sum( qmamount ) = 0 THEN'0' ELSE '-1' END AS balanceSubjectDir,
-        case when sum( qmlocalamount )>0 then sum( qmlocalamount )
-        else 0 end as 	balanceDeditValue, -- 期末余额借方金额
-
-        case when sum( qmlocalamount )>0 then sum( qmlocalamount )
-        else 0 end as	balanceCreditValue, -- 期末余额贷方金额
-        sum( ljlocaldebitamount ) AS totalDebitValue,
-        sum( ljlocalcreditamount ) AS totalCreditValue,
-        org.code GSBM,
-        org.name GSMC
-        FROM
-        (
-        SELECT DISTINCT
-        accperiodmonth.periodyear YEAR,
-        accperiodmonth.PERIOD ADJUSTPERIOD,
-        dezz.pk_org,
-        dezz.pk_accasoa,
-        dezz.pk_currtype,
-        dezz.assid assid,
-        0 AS localdebitamount,
-        0 AS localcreditamount,
-        0 AS debitamount,
-        0 AS creditamount,
-        sum( localdebitamount ) AS ljlocaldebitamount,
-        sum( localcreditamount ) AS ljlocalcreditamount,
-        sum( debitamount ) AS ljdebitamount,
-        sum( creditamount ) AS ljcreditamount,
-        0 AS qmlocalamount,
-        0 AS qmamount
-        FROM
-        ( SELECT substr( yearmth, 0, 4 ) periodyear, substr( yearmth, 6, 7 ) period FROM bd_accperiodmonth WHERE yearmth  &lt; TO_CHAR( SYSDATE, 'YYYY-MM' ) ) accperiodmonth
-        LEFT JOIN gl_balance dezz ON dezz.YEAR = accperiodmonth.periodyear
-        AND dezz.adjustperiod  &lt; = accperiodmonth.period
-        WHERE
-        voucherkind != 5
-        AND voucherkind != 4
-        AND dezz.adjustperiod > '00'
-        GROUP BY
-        accperiodmonth.periodyear,
-        accperiodmonth.PERIOD,
-        dezz.pk_org,
-        dezz.pk_accasoa,
-        dezz.pk_currtype,
-        dezz.assid UNION ALL
-        SELECT DISTINCT
-        dezz.YEAR,
-        dezz.ADJUSTPERIOD,
-        dezz.pk_org,
-        dezz.pk_accasoa,
-        dezz.pk_currtype,
-        dezz.assid,
-        sum( localdebitamount ) AS localdebitamount,
-        sum( localcreditamount ) AS localcreditamount,
-        sum( debitamount ) AS debitamount,
-        sum( creditamount ) AS creditamount,
-        0 AS ljlocaldebitamount,
-        0 AS ljlocalcreditamount,
-        0 AS ljdebitamount,
-        0 AS ljcreditamount,
-        0 AS qmlocalamount,
-        0 AS qmamount
-        FROM
-        gl_balance dezz
-        WHERE
-        voucherkind != 5
-        AND voucherkind != 4
-        GROUP BY
-        dezz.YEAR,
-        dezz.ADJUSTPERIOD,
-        dezz.pk_org,
-        dezz.pk_accasoa,
-        dezz.pk_currtype,
-        dezz.assid UNION ALL
-        SELECT DISTINCT
-        accperiodmonth.periodyear YEAR,
-        accperiodmonth.PERIOD ADJUSTPERIOD,
-        dezz.pk_org,
-        dezz.pk_accasoa,
-        dezz.pk_currtype,
-        dezz.assid assid,
-        0 AS localdebitamount,
-        0 AS localcreditamount,
-        0 AS debitamount,
-        0 AS creditamount,
-        0 AS ljlocaldebitamount,
-        0 AS ljlocalcreditamount,
-        0 AS ljdebitamount,
-        0 AS ljcreditamount,
-        sum( localdebitamount ) - sum( localcreditamount ) AS qmlocalamount,
-        sum( debitamount ) - sum( creditamount ) AS qmamount
-        FROM
-        ( SELECT substr( yearmth, 0, 4 ) periodyear, substr( yearmth, 6, 7 ) period FROM bd_accperiodmonth WHERE yearmth  &lt; TO_CHAR( SYSDATE, 'YYYY-MM' ) ) accperiodmonth
-        LEFT JOIN gl_balance dezz ON dezz.YEAR = accperiodmonth.periodyear
-        AND dezz.adjustperiod  &lt; = accperiodmonth.period
-        WHERE
-        voucherkind != 5
-        AND voucherkind != 4
-        AND dezz.adjustperiod >= '00'
-        AND dezz.adjustperiod != '12A'
-        GROUP BY
-        accperiodmonth.periodyear,
-        accperiodmonth.PERIOD,
-        dezz.pk_org,
-        dezz.pk_accasoa,
-        dezz.pk_currtype,
-        dezz.assid
-        ) a
-        LEFT JOIN org_orgs org ON org.pk_org = a.pk_org
-        LEFT JOIN bd_accasoa oa ON oa.pk_accasoa = a.pk_accasoa
-        LEFT JOIN bd_account nt ON nt.pk_account = oa.pk_account
-        LEFT JOIN bd_currtype currtype ON a.pk_currtype = currtype.pk_currtype
-        LEFT JOIN gl_docfree1 fr1 ON fr1.assid = a.assid
-        where adjustperiod != '12A'
-        and adjustperiod >= '00'
-        and adjustperiod != '00'
-        GROUP BY
-        year,
-        adjustperiod,
-        nt.code ,
-        oa.name ,
-        oa.dispname,
-        nt.pid,
-        balanorient,
-        pk_acctype,
-        org.code,
-        org.name,
-        nt.sumprint_level
-        )m1
+        select * from V_LPHB_KMFZYE
         <trim prefix="where" prefixOverrides="and">
             <if test="orgCode != null and orgCode !='' "> and gsbm = #{orgCode} </if>
-            <if test="sysData != null and sysData !='' "> and yearperiod = {sysData}   </if>
+            <if test="sysData != null and sysData !='' "> and yearperiod = #{sysData}   </if>
         </trim>
     </select>
 </mapper>
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 556bf277..523129b0 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
@@ -88,7 +88,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
     //Integer size = 50;
 
     boolean flags = false;
-    String uploadBalanceTableUrl = "http://oapi.nanofintax.com/api/collect/uploadBalanceTable?accessToken";
+    String uploadBalanceTableUrl = "http://122.9.186.182:30887/open/api/uploadBalanceTable";
     String cbUrl = "http://122.9.186.182:30887/open/api/uploadFinancialReport";
     String dataUrl = "https://workbench.test.htszny.com/oapi/invoice_rec/standing/book/queryList";//全量发票数据
     String tokenUrl = "http://oapi.nanofintax.com/api/getToken";
@@ -963,8 +963,8 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         Date date = null;
         String qncjzq = null;
         IncomeInvoiceEntity dyAloneId = null;
-        JSONObject dydata = null;
-        JSONObject qndata = null;
+        JSONObject dydata = new JSONObject();
+        JSONObject qndata = new JSONObject();
         IncomeInvoiceEntity qnAloneId = null;
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
@@ -985,10 +985,11 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         jnentity.setSysData(cjzq);
         jnentity.setOrgCode(ztbm);
         List<IncomeInvoiceEntity> jnlist = incomeInvoiceDao.queryZtzz(jnentity);
+        //List<IncomeInvoiceEntity> jnlist = null;
         if(jnlist != null && jnlist.size() == 1){
             dyAloneId = jnlist.get(0);
         }else {
-            return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送");
+            //return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送");
         }
         //查询去年当帐套组织
         IncomeInvoiceEntity qnentity = new IncomeInvoiceEntity();
@@ -996,6 +997,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         qnentity.setSysData(qncjzq);
         qnentity.setOrgCode(ztbm);
         List<IncomeInvoiceEntity> qnlist = incomeInvoiceDao.queryZtzz(qnentity);
+        //List<IncomeInvoiceEntity> qnlist = null;
         if(qnlist != null && qnlist.size() == 1){
             qnAloneId = qnlist.get(0);
         }else {
@@ -1003,15 +1005,18 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         }
 
         //查询当月的财报数据
-        IncomeInvoiceEntity jnquerydata = new IncomeInvoiceEntity();
-        jnquerydata.setDataSourceCode("htBip");
-        jnquerydata.setAloneId(dyAloneId.getAloneId());
-        List<JSONObject> dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata);
-        if(dydataList != null && dydataList.size() == 1){
-            dydata = dydataList.get(0);
-        }else {
-            return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送");
+        if(dyAloneId != null){
+            IncomeInvoiceEntity jnquerydata = new IncomeInvoiceEntity();
+            jnquerydata.setDataSourceCode("htBip");
+            jnquerydata.setAloneId(dyAloneId.getAloneId());
+            List<JSONObject> dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata);
+            if(dydataList != null && dydataList.size() == 1){
+                dydata = dydataList.get(0);
+            }else {
+                //return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送");
+            }
         }
+
         //查询去年当期的财报数据
         if(qnAloneId != null){
             //查找去年数据