hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

财报代码编写

This commit is contained in:
lvleigang 2025-04-25 10:50:34 +08:00
parent ae6abb3a59
commit bf78401bc8
6 changed files with 476 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base-buildpackage/pom.xml
View File

@ -43,6 +43,12 @@
<profile.active>httest</profile.active>
</properties>
</profile>
<profile>
<id>dev</id> <!--开发环境-->
<properties>
<profile.active>dev</profile.active>
</properties>
</profile>
<profile>
<id>llg</id> <!--开发环境-->
<properties>

540
base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
View File

@ -256,276 +256,276 @@
SELECT
a.ALONE_ID as ALONE_ID,
a.M10004 as aM10004,
a.M10005 as aM10005,
a.M10010 as aM10010,
a.M10012 as aM10012,
a.M10014 as aM10014,
a.M10019 as aM10019,
a.M10020 as aM10020,
a.M10021 as aM10021,
a.M10022 as aM10022,
a.M10025 as aM10025,
a.M10110 as aM10110,
a.M10027 as aM10027,
a.M10112 as aM10112,
a.M10029 as aM10029,
a.M10032 as aM10032,
a.M10033 as aM10033,
a.M10034 as aM10034,
a.M10035 as aM10035,
a.M10040 as aM10040,
a.M10128 as aM10128,
a.M10042 as aM10042,
a.M10130 as aM10130,
a.M10044 as aM10044,
a.M10045 as aM10045,
a.M10046 as aM10046,
a.M10047 as aM10047,
a.M10048 as aM10048,
a.M10049 as aM10049,
a.M10050 as aM10050,
a.M10051 as aM10051,
a.M10052 as aM10052,
a.M10053 as aM10053,
a.M10054 as aM10054,
a.M10055 as aM10055,
a.M10057 as aM10057,
a.M10059 as aM10059,
a.M10060 as aM10060,
a.M10061 as aM10061,
a.M10062 as aM10062,
a.M10063 as aM10063,
a.M10064 as aM10064,
a.M10065 as aM10065,
a.M10066 as aM10066,
a.M10073 as aM10073,
a.M10146 as aM10146,
a.M10075 as aM10075,
a.M10148 as aM10148,
a.M10077 as aM10077,
a.M10078 as aM10078,
a.M10079 as aM10079,
a.M10080 as aM10080,
a.M10081 as aM10081,
a.M10082 as aM10082,
a.M10083 as aM10083,
a.M10084 as aM10084,
a.M10087 as aM10087,
a.M10088 as aM10088,
a.M10091 as aM10091,
a.M10164 as aM10164,
a.M10093 as aM10093,
a.M10166 as aM10166,
a.M10095 as aM10095,
a.M10096 as aM10096,
a.M10097 as aM10097,
a.M10098 as aM10098,
a.M10099 as aM10099,
a.M10100 as aM10100,
a.M10101 as aM10101,
a.M10102 as aM10102,
a.M10105 as aM10105,
a.M10106 as aM10106,
a.M10109 as aM10109,
a.M10182 as aM10182,
a.M10111 as aM10111,
a.M10184 as aM10184,
a.M10113 as aM10113,
a.M10114 as aM10114,
a.M10115 as aM10115,
a.M10116 as aM10116,
a.M10117 as aM10117,
a.M10118 as aM10118,
a.M10119 as aM10119,
a.M10120 as aM10120,
a.M10123 as aM10123,
a.M10124 as aM10124,
a.M10127 as aM10127,
a.M10200 as aM10200,
a.M10129 as aM10129,
a.M10202 as aM10202,
a.M10131 as aM10131,
a.M10132 as aM10132,
a.M10133 as aM10133,
a.M10134 as aM10134,
a.M10135 as aM10135,
a.M10138 as aM10138,
a.M10141 as aM10141,
a.M10142 as aM10142,
a.M10143 as aM10143,
a.M10144 as aM10144,
a.M10145 as aM10145,
a.M10147 as aM10147,
a.M10149 as aM10149,
a.M10150 as aM10150,
a.M10151 as aM10151,
a.M10152 as aM10152,
a.M10153 as aM10153,
a.M10154 as aM10154,
a.M10155 as aM10155,
a.M10156 as aM10156,
a.M10257 as aM10257,
a.M10259 as aM10259,
a.M10159 as aM10159,
a.M10160 as aM10160,
a.M10161 as aM10161,
a.M10162 as aM10162,
a.M10163 as aM10163,
a.M10165 as aM10165,
a.M10167 as aM10167,
a.M10168 as aM10168,
a.M10169 as aM10169,
a.M10170 as aM10170,
a.M10171 as aM10171,
a.M10172 as aM10172,
a.M10173 as aM10173,
a.M10174 as aM10174,
a.M10281 as aM10281,
a.M10283 as aM10283,
a.M10179 as aM10179,
a.M10180 as aM10180,
a.M10181 as aM10181,
a.M10222 as aM10222,
a.M10183 as aM10183,
a.M10224 as aM10224,
a.M10185 as aM10185,
a.M10186 as aM10186,
a.M10187 as aM10187,
a.M10188 as aM10188,
a.M10189 as aM10189,
a.M10190 as aM10190,
a.M10191 as aM10191,
a.M10192 as aM10192,
a.M10295 as aM10295,
a.M10193 as aM10193,
a.M10297 as aM10297,
a.M10194 as aM10194,
a.M10195 as aM10195,
a.M10196 as aM10196,
a.M10197 as aM10197,
a.M10198 as aM10198,
a.M10199 as aM10199,
a.M10201 as aM10201,
a.M10203 as aM10203,
a.M10208 as aM10208,
a.M10209 as aM10209,
a.M10212 as aM10212,
a.M10310 as aM10310,
a.M10214 as aM10214,
a.M10312 as aM10312,
a.M10216 as aM10216,
a.M10217 as aM10217,
a.M10218 as aM10218,
a.M10219 as aM10219,
a.M10220 as aM10220,
a.M10221 as aM10221,
a.M10223 as aM10223,
a.M10225 as aM10225,
a.M10226 as aM10226,
a.M10227 as aM10227,
a.M10230 as aM10230,
a.M10231 as aM10231,
a.M10234 as aM10234,
a.M10325 as aM10325,
a.M10236 as aM10236,
a.M10327 as aM10327,
a.M10238 as aM10238,
a.M10239 as aM10239,
a.M10240 as aM10240,
a.M10241 as aM10241,
a.M10242 as aM10242,
a.M10243 as aM10243,
a.M10244 as aM10244,
a.M10245 as aM10245,
a.M10246 as aM10246,
a.M10247 as aM10247,
a.M10248 as aM10248,
a.M10249 as aM10249,
a.M10250 as aM10250,
a.M10251 as aM10251,
a.M10252 as aM10252,
a.M10253 as aM10253,
a.M10256 as aM10256,
a.M10340 as aM10340,
a.M10258 as aM10258,
a.M10342 as aM10342,
a.M10260 as aM10260,
a.M10265 as aM10265,
a.M10266 as aM10266,
a.M10267 as aM10267,
a.M10268 as aM10268,
a.M10269 as aM10269,
a.M10276 as aM10276,
a.M10277 as aM10277,
a.M10280 as aM10280,
a.M10282 as aM10282,
a.M10284 as aM10284,
a.M10287 as aM10287,
a.M10288 as aM10288,
a.M10289 as aM10289,
a.M10290 as aM10290,
a.M10291 as aM10291,
a.M10292 as aM10292,
a.M10293 as aM10293,
a.M10294 as aM10294,
a.M10011 as aM10011,
a.M10296 as aM10296,
a.M10013 as aM10013,
a.M10298 as aM10298,
a.M10299 as aM10299,
a.M10300 as aM10300,
a.M10301 as aM10301,
a.M10304 as aM10304,
a.M10305 as aM10305,
a.M10306 as aM10306,
a.M10307 as aM10307,
a.M10308 as aM10308,
a.M10309 as aM10309,
a.M10026 as aM10026,
a.M10311 as aM10311,
a.M10028 as aM10028,
a.M10313 as aM10313,
a.M10314 as aM10314,
a.M10315 as aM10315,
a.M10316 as aM10316,
a.M10319 as aM10319,
a.M10320 as aM10320,
a.M10321 as aM10321,
a.M10323 as aM10323,
a.M10326 as aM10326,
a.M10041 as aM10041,
a.M10328 as aM10328,
a.M10043 as aM10043,
a.M10329 as aM10329,
a.M10334 as aM10334,
a.M10335 as aM10335,
a.M10336 as aM10336,
a.M10338 as aM10338,
a.M10337 as aM10337,
a.M10339 as aM10339,
a.M10341 as aM10341,
a.M10056 as aM10056,
a.M10343 as aM10343,
a.M10058 as aM10058,
a.M10344 as aM10344,
a.M10347 as aM10347,
a.M10348 as aM10348,
a.M10349 as aM10349,
a.M10350 as aM10350,
a.M10351 as aM10351,
a.M10352 as aM10352,
a.M10353 as aM10353,
a.M10354 as aM10354,
b.MPQW10U as bMPQW10U,
b.MP81A2Z as bMP81A2Z,
b.MS13DPL as bMS13DPL,
b.M6TFKPL as bM6TFKPL,
c.M10002 as cM10002,
c.M10000 as cM10000,
c.M10004 as cM10004,
c.M10003 as cM10003,
c.M10001 as cM10001
a.M10004 as AM10004,
a.M10005 as AM10005,
a.M10010 as AM10010,
a.M10012 as AM10012,
a.M10014 as AM10014,
a.M10019 as AM10019,
a.M10020 as AM10020,
a.M10021 as AM10021,
a.M10022 as AM10022,
a.M10025 as AM10025,
a.M10110 as AM10110,
a.M10027 as AM10027,
a.M10112 as AM10112,
a.M10029 as AM10029,
a.M10032 as AM10032,
a.M10033 as AM10033,
a.M10034 as AM10034,
a.M10035 as AM10035,
a.M10040 as AM10040,
a.M10128 as AM10128,
a.M10042 as AM10042,
a.M10130 as AM10130,
a.M10044 as AM10044,
a.M10045 as AM10045,
a.M10046 as AM10046,
a.M10047 as AM10047,
a.M10048 as AM10048,
a.M10049 as AM10049,
a.M10050 as AM10050,
a.M10051 as AM10051,
a.M10052 as AM10052,
a.M10053 as AM10053,
a.M10054 as AM10054,
a.M10055 as AM10055,
a.M10057 as AM10057,
a.M10059 as AM10059,
a.M10060 as AM10060,
a.M10061 as AM10061,
a.M10062 as AM10062,
a.M10063 as AM10063,
a.M10064 as AM10064,
a.M10065 as AM10065,
a.M10066 as AM10066,
a.M10073 as AM10073,
a.M10146 as AM10146,
a.M10075 as AM10075,
a.M10148 as AM10148,
a.M10077 as AM10077,
a.M10078 as AM10078,
a.M10079 as AM10079,
a.M10080 as AM10080,
a.M10081 as AM10081,
a.M10082 as AM10082,
a.M10083 as AM10083,
a.M10084 as AM10084,
a.M10087 as AM10087,
a.M10088 as AM10088,
a.M10091 as AM10091,
a.M10164 as AM10164,
a.M10093 as AM10093,
a.M10166 as AM10166,
a.M10095 as AM10095,
a.M10096 as AM10096,
a.M10097 as AM10097,
a.M10098 as AM10098,
a.M10099 as AM10099,
a.M10100 as AM10100,
a.M10101 as AM10101,
a.M10102 as AM10102,
a.M10105 as AM10105,
a.M10106 as AM10106,
a.M10109 as AM10109,
a.M10182 as AM10182,
a.M10111 as AM10111,
a.M10184 as AM10184,
a.M10113 as AM10113,
a.M10114 as AM10114,
a.M10115 as AM10115,
a.M10116 as AM10116,
a.M10117 as AM10117,
a.M10118 as AM10118,
a.M10119 as AM10119,
a.M10120 as AM10120,
a.M10123 as AM10123,
a.M10124 as AM10124,
a.M10127 as AM10127,
a.M10200 as AM10200,
a.M10129 as AM10129,
a.M10202 as AM10202,
a.M10131 as AM10131,
a.M10132 as AM10132,
a.M10133 as AM10133,
a.M10134 as AM10134,
a.M10135 as AM10135,
a.M10138 as AM10138,
a.M10141 as AM10141,
a.M10142 as AM10142,
a.M10143 as AM10143,
a.M10144 as AM10144,
a.M10145 as AM10145,
a.M10147 as AM10147,
a.M10149 as AM10149,
a.M10150 as AM10150,
a.M10151 as AM10151,
a.M10152 as AM10152,
a.M10153 as AM10153,
a.M10154 as AM10154,
a.M10155 as AM10155,
a.M10156 as AM10156,
a.M10257 as AM10257,
a.M10259 as AM10259,
a.M10159 as AM10159,
a.M10160 as AM10160,
a.M10161 as AM10161,
a.M10162 as AM10162,
a.M10163 as AM10163,
a.M10165 as AM10165,
a.M10167 as AM10167,
a.M10168 as AM10168,
a.M10169 as AM10169,
a.M10170 as AM10170,
a.M10171 as AM10171,
a.M10172 as AM10172,
a.M10173 as AM10173,
a.M10174 as AM10174,
a.M10281 as AM10281,
a.M10283 as AM10283,
a.M10179 as AM10179,
a.M10180 as AM10180,
a.M10181 as AM10181,
a.M10222 as AM10222,
a.M10183 as AM10183,
a.M10224 as AM10224,
a.M10185 as AM10185,
a.M10186 as AM10186,
a.M10187 as AM10187,
a.M10188 as AM10188,
a.M10189 as AM10189,
a.M10190 as AM10190,
a.M10191 as AM10191,
a.M10192 as AM10192,
a.M10295 as AM10295,
a.M10193 as AM10193,
a.M10297 as AM10297,
a.M10194 as AM10194,
a.M10195 as AM10195,
a.M10196 as AM10196,
a.M10197 as AM10197,
a.M10198 as AM10198,
a.M10199 as AM10199,
a.M10201 as AM10201,
a.M10203 as AM10203,
a.M10208 as AM10208,
a.M10209 as AM10209,
a.M10212 as AM10212,
a.M10310 as AM10310,
a.M10214 as AM10214,
a.M10312 as AM10312,
a.M10216 as AM10216,
a.M10217 as AM10217,
a.M10218 as AM10218,
a.M10219 as AM10219,
a.M10220 as AM10220,
a.M10221 as AM10221,
a.M10223 as AM10223,
a.M10225 as AM10225,
a.M10226 as AM10226,
a.M10227 as AM10227,
a.M10230 as AM10230,
a.M10231 as AM10231,
a.M10234 as AM10234,
a.M10325 as AM10325,
a.M10236 as AM10236,
a.M10327 as AM10327,
a.M10238 as AM10238,
a.M10239 as AM10239,
a.M10240 as AM10240,
a.M10241 as AM10241,
a.M10242 as AM10242,
a.M10243 as AM10243,
a.M10244 as AM10244,
a.M10245 as AM10245,
a.M10246 as AM10246,
a.M10247 as AM10247,
a.M10248 as AM10248,
a.M10249 as AM10249,
a.M10250 as AM10250,
a.M10251 as AM10251,
a.M10252 as AM10252,
a.M10253 as AM10253,
a.M10256 as AM10256,
a.M10340 as AM10340,
a.M10258 as AM10258,
a.M10342 as AM10342,
a.M10260 as AM10260,
a.M10265 as AM10265,
a.M10266 as AM10266,
a.M10267 as AM10267,
a.M10268 as AM10268,
a.M10269 as AM10269,
a.M10276 as AM10276,
a.M10277 as AM10277,
a.M10280 as AM10280,
a.M10282 as AM10282,
a.M10284 as AM10284,
a.M10287 as AM10287,
a.M10288 as AM10288,
a.M10289 as AM10289,
a.M10290 as AM10290,
a.M10291 as AM10291,
a.M10292 as AM10292,
a.M10293 as AM10293,
a.M10294 as AM10294,
a.M10011 as AM10011,
a.M10296 as AM10296,
a.M10013 as AM10013,
a.M10298 as AM10298,
a.M10299 as AM10299,
a.M10300 as AM10300,
a.M10301 as AM10301,
a.M10304 as AM10304,
a.M10305 as AM10305,
a.M10306 as AM10306,
a.M10307 as AM10307,
a.M10308 as AM10308,
a.M10309 as AM10309,
a.M10026 as AM10026,
a.M10311 as AM10311,
a.M10028 as AM10028,
a.M10313 as AM10313,
a.M10314 as AM10314,
a.M10315 as AM10315,
a.M10316 as AM10316,
a.M10319 as AM10319,
a.M10320 as AM10320,
a.M10321 as AM10321,
a.M10323 as AM10323,
a.M10326 as AM10326,
a.M10041 as AM10041,
a.M10328 as AM10328,
a.M10043 as AM10043,
a.M10329 as AM10329,
a.M10334 as AM10334,
a.M10335 as AM10335,
a.M10336 as AM10336,
a.M10338 as AM10338,
a.M10337 as AM10337,
a.M10339 as AM10339,
a.M10341 as AM10341,
a.M10056 as AM10056,
a.M10343 as AM10343,
a.M10058 as AM10058,
a.M10344 as AM10344,
a.M10347 as AM10347,
a.M10348 as AM10348,
a.M10349 as AM10349,
a.M10350 as AM10350,
a.M10351 as AM10351,
a.M10352 as AM10352,
a.M10353 as AM10353,
a.M10354 as AM10354,
b.MPQW10U as BMPQW10U,
b.MP81A2Z as BMP81A2Z,
b.MS13DPL as BMS13DPL,
b.M6TFKPL as BM6TFKPL,
c.M10002 as CM10002,
c.M10000 as CM10000,
c.M10004 as CM10004,
c.M10003 as CM10003,
c.M10001 as CM10001
FROM
iufo_measure_data_qi0xy5nl a
LEFT JOIN iufo_measure_data_v40w9co7 b on a.ALONE_ID = b.ALONE_ID

2
base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java
View File

@ -3,6 +3,7 @@ package com.hzya.frame.plugin.incomeInvoiceData.plugin;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity;
import com.hzya.frame.plugin.incomeInvoiceData.service.IIncomeInvoiceService;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -53,6 +54,7 @@ public class FinancialReportPluginInitializer extends PluginBaseEntity{
public JsonResultEntity executeBusiness(JSONObject requestJson) {
try {
logger.info("======开始执行财务信息同步========");
//return BaseResult.getSuccessMessageEntity("数据获取成功");
return incomeInvoiceService.sendFinancialReportPlugin(requestJson);
}catch (Exception e){
logger.info("======执行财务同步失败:{}========",e.getMessage());

310
base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
View File

@ -32,7 +32,9 @@ import org.apache.http.util.EntityUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import com.hzya.frame.basedao.service.impl.BaseService;
import org.springframework.core.task.TaskExecutor;
import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.math.BigDecimal;
@ -68,7 +70,8 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
String accessSecret = "34e5fc32ac894a2ba2ade8c3852c7a0a";
String taxNo = "91330110MAC5FPUY2U";
Integer size = 50;
@Resource
private TaskExecutor taskExecutor;
/**
* @Author lvleigang
* @Description 全量发票数据
@ -696,20 +699,32 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
String eventType = jsonStr.getString("eventType");
switch (eventType) {
case "onProcessFinished"://流程结束事件，同步物料到U8C
JSONObject businessData = businessDataStr.getJSONObject("formmain_0708");
if(businessData.getString("field0007") == null){//数据类型
if(businessDataStr.getString("dataType") == null){//数据类型
return BaseResult.getFailureMessageEntity("数据类型为空");
}
if(businessData.getString("field0007").equals("1")){//科目余额
if(businessDataStr.getString("dataType").equals("1")){//科目余额
}
if(businessData.getString("field0007").equals("2")){//财报
return sendFinancialReport(businessData);
if(businessDataStr.getString("dataType").equals("2")){//财报
String ztbm = businessDataStr.getString("ztCode");//账套编码
String cjzq = businessDataStr.getString("period");//采集账期
String rwbm = businessDataStr.getString("taskNo");//任务编码
if(ztbm == null || "".equals(ztbm)){
return BaseResult.getFailureMessageEntity("账套编码为空");
}
if(cjzq == null || "".equals(cjzq)){
return BaseResult.getFailureMessageEntity("采集账期为空");
}
if(rwbm == null || "".equals(rwbm)){
return BaseResult.getFailureMessageEntity("任务编码为空");
}
taskExecutor.execute(() -> sendFinancialReport(ztbm,cjzq,rwbm));
return BaseResult.getSuccessMessageEntity("数据获取成功");
}
if(businessData.getString("field0007").equals("3")){//进项发票
if(businessDataStr.getString("dataType").equals("3")){//进项发票
return BaseResult.getFailureMessageEntity("数据类型错误");
}
if(businessData.getString("field0007").equals("4")){//销项发票
if(businessDataStr.getString("dataType").equals("4")){//销项发票
return BaseResult.getFailureMessageEntity("数据类型错误");
}
return BaseResult.getSuccessMessageEntity("推送数据成功");
@ -721,39 +736,25 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
}
/**
* @Author lvleigang
* @Description 发送财报数据
* @Date 5:28 下午 2025/4/22
* @param businessData
* @Description
* @Date 3:18 下午 2025/4/24
* @param ztbm 账套编码
* @param cjzq 采集账期
* @param rwbm 任务编码
* @return com.hzya.frame.web.entity.JsonResultEntity
**/
private JsonResultEntity sendFinancialReport(JSONObject businessData) {
private JsonResultEntity sendFinancialReport(String ztbm ,String cjzq,String rwbm) {
String access_token = getToken();
if (access_token == null) {
return BaseResult.getFailureMessageEntity("token获取失败");
}
String url = cbUrl+access_token;
String ztbm = businessData.getString("field0005");//账套编码
String sh = businessData.getString("field0006");//税号
String sjlx = businessData.getString("field0007");//数据类型
String cjzq = businessData.getString("field0008");//采集账期
String rwbm = businessData.getString("field0009");//任务编码
if(ztbm == null || "".equals(ztbm)){
return BaseResult.getSuccessMessageEntity("账套编码为空");
}
if(cjzq == null || "".equals(cjzq)){
return BaseResult.getSuccessMessageEntity("采集账期为空");
}
if(rwbm == null || "".equals(rwbm)){
return BaseResult.getSuccessMessageEntity("任务编码为空");
}
Date date = null;
String qncjzq = null;
IncomeInvoiceEntity dyAloneId = null;
JSONObject dydata = null;
JSONObject qndata = null;
@ -773,7 +774,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
//查询当月帐套组织
IncomeInvoiceEntity jnentity = new IncomeInvoiceEntity();
jnentity.setDataSourceCode("");
jnentity.setDataSourceCode("htBip");
jnentity.setSysData(cjzq);
jnentity.setOrgCode(ztbm);
List<IncomeInvoiceEntity> jnlist = incomeInvoiceDao.queryZtzz(jnentity);
@ -784,7 +785,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
}
//查询去年当帐套组织
IncomeInvoiceEntity qnentity = new IncomeInvoiceEntity();
qnentity.setDataSourceCode("");
qnentity.setDataSourceCode("htBip");
qnentity.setSysData(qncjzq);
qnentity.setOrgCode(ztbm);
List<IncomeInvoiceEntity> qnlist = incomeInvoiceDao.queryZtzz(qnentity);
@ -796,7 +797,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
//查询当月的财报数据
IncomeInvoiceEntity jnquerydata = new IncomeInvoiceEntity();
jnquerydata.setDataSourceCode("");
jnquerydata.setDataSourceCode("htBip");
jnquerydata.setAloneId(dyAloneId.getAloneId());
List<JSONObject> dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata);
if(dydataList != null && dydataList.size() == 1){
@ -808,7 +809,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
if(qnAloneId != null){
//查找去年数据
IncomeInvoiceEntity qnquerydata = new IncomeInvoiceEntity();
qnquerydata.setDataSourceCode("");
qnquerydata.setDataSourceCode("htBip");
qnquerydata.setAloneId(qnAloneId.getAloneId());
List<JSONObject> qndataList = incomeInvoiceDao.queryByAloneId(qnquerydata);
if(qndataList != null && qndataList.size() == 1){
@ -828,65 +829,65 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
zcfzb.put("period",cjzq);
zcfzb.put("reportType",1);
JSONArray reportSubjects1 = new JSONArray();
setDataToArray("货币资金",dydata.getString(""),"2",reportSubjects1);
setDataToArray("短期借款","3","4",reportSubjects1);
setDataToArray("交易性金融资产","5","6",reportSubjects1);
setDataToArray("以公允价值计量且其变动计入当期损益的金融负债","7","8",reportSubjects1);
setDataToArray("应收票据","9","10",reportSubjects1);
setDataToArray("应付票据","11","12",reportSubjects1);
setDataToArray("应收账款","13","14",reportSubjects1);
setDataToArray("应付账款","15","16",reportSubjects1);
setDataToArray("减：坏账准备","17","18",reportSubjects1);
setDataToArray("预收款项","19","20",reportSubjects1);
setDataToArray("预付款项","21","22",reportSubjects1);
setDataToArray("合同负债","23","24",reportSubjects1);
setDataToArray("应收利息","25","26",reportSubjects1);
setDataToArray("应付职工薪酬","27","28",reportSubjects1);
setDataToArray("应收股利","29","30",reportSubjects1);
setDataToArray("应交税费","31","32",reportSubjects1);
setDataToArray("其他应收款","33","34",reportSubjects1);
setDataToArray("应付利息","35","36",reportSubjects1);
setDataToArray("减：坏账准备","37","38",reportSubjects1);
setDataToArray("应付股利","39","40",reportSubjects1);
setDataToArray("存货","41","42",reportSubjects1);
setDataToArray("其他应付款","43","44",reportSubjects1);
setDataToArray("合同资产","45","46",reportSubjects1);
setDataToArray("其他流动资产","47","48",reportSubjects1);
setDataToArray("长期借款","49","50",reportSubjects1);
setDataToArray("应付债券","51","52",reportSubjects1);
setDataToArray("债权投资","53","54",reportSubjects1);
setDataToArray("长期应收款","55","56",reportSubjects1);
setDataToArray("长期股权投资","57","58",reportSubjects1);
setDataToArray("租赁负债","59","60",reportSubjects1);
setDataToArray("长期应付款","61","62",reportSubjects1);
setDataToArray("其他非流动金融资产","63","64",reportSubjects1);
setDataToArray("专项应付款","65","66",reportSubjects1);
setDataToArray("投资性房地产","67","68",reportSubjects1);
setDataToArray("预计负债","69","70",reportSubjects1);
setDataToArray("递延收益","71","72",reportSubjects1);
setDataToArray("递延所得税负债","73","74",reportSubjects1);
setDataToArray("固定资产","75","76",reportSubjects1);
setDataToArray("减：累计折旧","77","78",reportSubjects1);
setDataToArray("减：固定资产减值准备","79","80",reportSubjects1);
setDataToArray("在建工程","81","82",reportSubjects1);
setDataToArray("实收资本（或股本）","83","84",reportSubjects1);
setDataToArray("工程物资","85","86",reportSubjects1);
setDataToArray("固定资产清理","87","88",reportSubjects1);
setDataToArray("资本公积","89","90",reportSubjects1);
setDataToArray("使用权资产","91","92",reportSubjects1);
setDataToArray("减：库存股","93","94",reportSubjects1);
setDataToArray("减：累计折旧","95","96",reportSubjects1);
setDataToArray("减：使用权资产减值准备","97","98",reportSubjects1);
setDataToArray("盈余公积","99","100",reportSubjects1);
setDataToArray("无形资产","101","102",reportSubjects1);
setDataToArray("未分配利润","103","104",reportSubjects1);
setDataToArray("减：累计摊销","105","106",reportSubjects1);
setDataToArray("减：无形资产减值准备","107","108",reportSubjects1);
setDataToArray("开发支出","109","110",reportSubjects1);
setDataToArray("商誉","111","112",reportSubjects1);
setDataToArray("长期待摊费用","113","114",reportSubjects1);
setDataToArray("递延所得税资产","115","116",reportSubjects1);
setDataToArray("其他非流动资产","117","118",reportSubjects1);
setDataToArray("货币资金",dydata.getString("AM10251"),dydata.getString("AM10250"),reportSubjects1);
setDataToArray("短期借款",dydata.getString("AM10249"),dydata.getString("AM10248"),reportSubjects1);
setDataToArray("交易性金融资产",dydata.getString("BMPQW10U"),dydata.getString("BMP81A2Z"),reportSubjects1);
setDataToArray("以公允价值计量且其变动计入当期损益的金融负债",dydata.getString("AM10227"),dydata.getString("AM10226"),reportSubjects1);
setDataToArray("应收票据",dydata.getString("AM10189"),dydata.getString("AM10188"),reportSubjects1);
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("预收款项",dydata.getString("AM10151"),dydata.getString("AM10150"),reportSubjects1);
setDataToArray("预付款项",dydata.getString("AM10135"),dydata.getString("AM10134"),reportSubjects1);
setDataToArray("合同负债",dydata.getString("AM10133"),dydata.getString("AM10132"),reportSubjects1);
setDataToArray("应收利息",dydata.getString("AM10117"),dydata.getString("AM10116"),reportSubjects1);
setDataToArray("应付职工薪酬",dydata.getString("AM10115"),dydata.getString("AM10114"),reportSubjects1);
setDataToArray("应收股利",dydata.getString("AM10099"),dydata.getString("AM10098"),reportSubjects1);
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("应付股利",dydata.getString("AM10061"),dydata.getString("AM10060"),reportSubjects1);
setDataToArray("存货",dydata.getString("AM10048"),dydata.getString("AM10047"),reportSubjects1);
setDataToArray("其他应付款",dydata.getString("AM10046"),dydata.getString("AM10045"),reportSubjects1);
setDataToArray("合同资产",dydata.getString("AM10033"),dydata.getString("AM10032"),reportSubjects1);
setDataToArray("其他流动资产",dydata.getString("AM10348"),dydata.getString("AM10347"),reportSubjects1);
setDataToArray("长期借款",dydata.getString("AM10316"),dydata.getString("AM10315"),reportSubjects1);
setDataToArray("应付债券",dydata.getString("AM10301"),dydata.getString("AM10300"),reportSubjects1);
setDataToArray("债权投资",dydata.getString("AM10288"),dydata.getString("AM10287"),reportSubjects1);
setDataToArray("长期应收款",dydata.getString("AM10268"),dydata.getString("AM10266"),reportSubjects1);
setDataToArray("长期股权投资",dydata.getString("AM10246"),dydata.getString("AM10244"),reportSubjects1);
setDataToArray("租赁负债",dydata.getString("AM10242"),dydata.getString("AM10241"),reportSubjects1);
setDataToArray("长期应付款",dydata.getString("AM10220"),dydata.getString("AM10219"),reportSubjects1);
setDataToArray("其他非流动金融资产",dydata.getString("BMS13DPL"),dydata.getString("BM6TFKPL"),reportSubjects1);
setDataToArray("专项应付款",dydata.getString("AM10198"),dydata.getString("AM10197"),reportSubjects1);
setDataToArray("投资性房地产",dydata.getString("AM10224"),dydata.getString("AM10222"),reportSubjects1);
setDataToArray("预计负债",dydata.getString("AM10180"),dydata.getString("AM10179"),reportSubjects1);
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("减：固定资产减值准备",dydata.getString("AM10166"),dydata.getString("AM10164"),reportSubjects1);
setDataToArray("在建工程",dydata.getString("AM10148"),dydata.getString("AM10146"),reportSubjects1);
setDataToArray("实收资本（或股本）",dydata.getString("AM10054"),dydata.getString("AM10053"),reportSubjects1);
setDataToArray("工程物资",dydata.getString("AM10130"),dydata.getString("AM10128"),reportSubjects1);
setDataToArray("固定资产清理",dydata.getString("AM10112"),dydata.getString("AM10110"),reportSubjects1);
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("减：使用权资产减值准备",dydata.getString("AM10028"),dydata.getString("AM10026"),reportSubjects1);
setDataToArray("盈余公积",dydata.getString("AM10309"),dydata.getString("AM10307"),reportSubjects1);
setDataToArray("无形资产",dydata.getString("AM10013"),dydata.getString("AM10011"),reportSubjects1);
setDataToArray("未分配利润",dydata.getString("AM10294"),dydata.getString("AM10292"),reportSubjects1);
setDataToArray("减：累计摊销",dydata.getString("CM10002"),dydata.getString("CM10000"),reportSubjects1);
setDataToArray("减：无形资产减值准备",dydata.getString("AM10342"),dydata.getString("AM10340"),reportSubjects1);
setDataToArray("开发支出",dydata.getString("AM10327"),dydata.getString("AM10325"),reportSubjects1);
setDataToArray("商誉",dydata.getString("AM10312"),dydata.getString("AM10310"),reportSubjects1);
setDataToArray("长期待摊费用",dydata.getString("AM10297"),dydata.getString("AM10295"),reportSubjects1);
setDataToArray("递延所得税资产",dydata.getString("AM10283"),dydata.getString("AM10281"),reportSubjects1);
setDataToArray("其他非流动资产",dydata.getString("AM10259"),dydata.getString("AM10257"),reportSubjects1);
zcfzb.put("reportSubjects",reportSubjects1);
@ -896,31 +897,31 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
llb.put("reportType",2);
JSONArray reportSubjects2 = new JSONArray();
setDataToArray("一、营业收入","120","120",reportSubjects2);
setDataToArray("其中:主营业务收入","123","123",reportSubjects2);
setDataToArray("其他业务收入","126","126",reportSubjects2);
setDataToArray("减：营业成本","129","129",reportSubjects2);
setDataToArray("其中:主营业务成本","132","132",reportSubjects2);
setDataToArray("其他业务成本","135","135",reportSubjects2);
setDataToArray("税金及附加","138","138",reportSubjects2);
setDataToArray("销售费用","141","141",reportSubjects2);
setDataToArray("管理费用","144","144",reportSubjects2);
setDataToArray("财务费用（收益以\"－\"号填列）","147","147",reportSubjects2);
setDataToArray("其中：利息费用","150","150",reportSubjects2);
setDataToArray("利息收入","153","153",reportSubjects2);
setDataToArray("研发费用","156","156",reportSubjects2);
setDataToArray("资产减值损失","159","159",reportSubjects2);
setDataToArray("信用减值损失","162","162",reportSubjects2);
setDataToArray("加：公允价值变动净收益（净损失以\"－\"号填列）","165","165",reportSubjects2);
setDataToArray("投资净收益（净损失以\"－\"号填列）","168","168",reportSubjects2);
setDataToArray("资产处置收益（净损失以\"－\"号填列）","171","171",reportSubjects2);
setDataToArray("其他收益","174","174",reportSubjects2);
setDataToArray("二、营业利润","177","177",reportSubjects2);
setDataToArray("加:营业外收入","180","180",reportSubjects2);
setDataToArray("减:营业外支出","183","183",reportSubjects2);
setDataToArray("三、利润总额（亏损总额以“-”号填列）","186","186",reportSubjects2);
setDataToArray("减:所得税费用","189","189",reportSubjects2);
setDataToArray("四、净利润（净亏损以“-”号填列）","192","192",reportSubjects2);
setDataToArray("一、营业收入",dydata.getString("AM10267"),qndata.getString("AM10267"),reportSubjects2);
setDataToArray("其中:主营业务收入",dydata.getString("AM10245"),qndata.getString("AM10245"),reportSubjects2);
setDataToArray("其他业务收入",dydata.getString("AM10223"),qndata.getString("AM10223"),reportSubjects2);
setDataToArray("减：营业成本",dydata.getString("AM10201"),qndata.getString("AM10201"),reportSubjects2);
setDataToArray("其中:主营业务成本",dydata.getString("AM10183"),qndata.getString("AM10183"),reportSubjects2);
setDataToArray("其他业务成本",dydata.getString("AM10165"),qndata.getString("AM10165"),reportSubjects2);
setDataToArray("税金及附加",dydata.getString("AM10147"),qndata.getString("AM10147"),reportSubjects2);
setDataToArray("销售费用",dydata.getString("AM10129"),qndata.getString("AM10129"),reportSubjects2);
setDataToArray("管理费用",dydata.getString("AM10111"),qndata.getString("AM10111"),reportSubjects2);
setDataToArray("财务费用（收益以\"－\"号填列）",dydata.getString("AM10093"),qndata.getString("AM10093"),reportSubjects2);
setDataToArray("其中：利息费用",dydata.getString("AM10075"),qndata.getString("AM10075"),reportSubjects2);
setDataToArray("利息收入",dydata.getString("AM10057"),qndata.getString("AM10057"),reportSubjects2);
setDataToArray("研发费用",dydata.getString("AM10042"),qndata.getString("AM10042"),reportSubjects2);
setDataToArray("资产减值损失",dydata.getString("AM10027"),qndata.getString("AM10027"),reportSubjects2);
setDataToArray("信用减值损失",dydata.getString("AM10012"),qndata.getString("AM10012"),reportSubjects2);
setDataToArray("加：公允价值变动净收益（净损失以\"－\"号填列）",dydata.getString("CM10003"),qndata.getString("CM10003"),reportSubjects2);
setDataToArray("投资净收益（净损失以\"－\"号填列）",dydata.getString("AM10343"),qndata.getString("AM10343"),reportSubjects2);
setDataToArray("资产处置收益（净损失以\"－\"号填列）",dydata.getString("AM10328"),qndata.getString("AM10328"),reportSubjects2);
setDataToArray("其他收益",dydata.getString("AM10313"),qndata.getString("AM10313"),reportSubjects2);
setDataToArray("二、营业利润",dydata.getString("AM10298"),qndata.getString("AM10298"),reportSubjects2);
setDataToArray("加:营业外收入",dydata.getString("AM10282"),qndata.getString("AM10282"),reportSubjects2);
setDataToArray("减:营业外支出",dydata.getString("AM10258"),qndata.getString("AM10258"),reportSubjects2);
setDataToArray("三、利润总额（亏损总额以“-”号填列）",dydata.getString("AM10236"),qndata.getString("AM10236"),reportSubjects2);
setDataToArray("减:所得税费用",dydata.getString("AM10214"),qndata.getString("AM10214"),reportSubjects2);
setDataToArray("四、净利润（净亏损以“-”号填列）",dydata.getString("AM10193"),qndata.getString("AM10193"),reportSubjects2);
llb.put("reportSubjects",reportSubjects2);
@ -928,47 +929,44 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
xjll.put("period",cjzq);
xjll.put("reportType",3);
JSONArray reportSubjects3 = new JSONArray();
setDataToArray("销售商品、提供劳务收到的现金","201","201",reportSubjects3);
setDataToArray("收到的税费返还","203","203",reportSubjects3);
setDataToArray("收到的其他与经营活动有关的现金","205","205",reportSubjects3);
setDataToArray("现金收入小计","207","207",reportSubjects3);
setDataToArray("购买商品、接受劳务支付的现金","209","209",reportSubjects3);
setDataToArray("支付给职工以及为职工支付的现金","211","211",reportSubjects3);
setDataToArray("支付的各项税费","213","213",reportSubjects3);
setDataToArray("支付的其他与经营活动有关的现金","9999","9999",reportSubjects3);
setDataToArray("现金流出小计","10632","10632",reportSubjects3);
setDataToArray("经营活动产生的现金流量净额","-10425","-10425",reportSubjects3);
setDataToArray("收回投资所收到的现金","221","221",reportSubjects3);
setDataToArray("取得投资收益所收到的现金","223","223",reportSubjects3);
setDataToArray("处置固定资产、无形资产和其他长期资产所收回的现金净额","225","225",reportSubjects3);
setDataToArray("处置子公司及其他营业单位收到的现金净额","227","227",reportSubjects3);
setDataToArray("收到的其他与投资活动有关的现金","229","229",reportSubjects3);
setDataToArray("现金流入小计","231","231",reportSubjects3);
setDataToArray("购建固定资产、无形资产和其他长期资产所支付的现金","233","233",reportSubjects3);
setDataToArray("投资所支付的现金","235","235",reportSubjects3);
setDataToArray("取得子公司及其他营业单位收到的现金净额","237","237",reportSubjects3);
setDataToArray("其他与投资有关","239","239",reportSubjects3);
setDataToArray("现金流出小计","241","241",reportSubjects3);
setDataToArray("投资活动产生的现金流量净额","243","243",reportSubjects3);
setDataToArray("吸收投资所收到的现金","245","245",reportSubjects3);
setDataToArray("子公司吸收少数股东投资收到的现金","247","247",reportSubjects3);
setDataToArray("借贷所收到现金","249","249",reportSubjects3);
setDataToArray("发行债券收到的现金","251","251",reportSubjects3);
setDataToArray("收到的其他与筹资活动有关的现金","22222","22222",reportSubjects3);
setDataToArray("现金流入小计","23214","23214",reportSubjects3);
setDataToArray("偿还债务所支付的现金","257","257",reportSubjects3);
setDataToArray("分配股利、利润、偿付利息所支付的现金","259","259",reportSubjects3);
setDataToArray("支付的其他与筹资活动有关的现金","261","261",reportSubjects3);
setDataToArray("现金流出小计","263","263",reportSubjects3);
setDataToArray("筹资活动产生的现金流量净额","22951","22951",reportSubjects3);
setDataToArray("四、汇率变动对现金流量的影响","267","267",reportSubjects3);
setDataToArray("五、现金及现金等价物净增加额","13036","13036",reportSubjects3);
setDataToArray("销售商品、提供劳务收到的现金",dydata.getString("AM10240"),qndata.getString("AM10240"),reportSubjects3);
setDataToArray("收到的税费返还",dydata.getString("AM10218"),qndata.getString("AM10218"),reportSubjects3);
setDataToArray("收到的其他与经营活动有关的现金",dydata.getString("AM10196"),qndata.getString("AM10196"),reportSubjects3);
setDataToArray("现金收入小计",dydata.getString("AM10160"),qndata.getString("AM10160"),reportSubjects3);
setDataToArray("购买商品、接受劳务支付的现金",dydata.getString("AM10142"),qndata.getString("AM10142"),reportSubjects3);
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("经营活动产生的现金流量净额",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("购建固定资产、无形资产和其他长期资产所支付的现金",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("投资活动产生的现金流量净额",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("偿还债务所支付的现金",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("筹资活动产生的现金流量净额",dydata.getString("AM10320"),qndata.getString("AM10320"),reportSubjects3);
setDataToArray("四、汇率变动对现金流量的影响",dydata.getString("AM10305"),qndata.getString("AM10305"),reportSubjects3);
setDataToArray("五、现金及现金等价物净增加额",dydata.getString("AM10290"),qndata.getString("AM10290"),reportSubjects3);
xjll.put("reportSubjects",reportSubjects3);
reportList.add(zcfzb);
reportList.add(llb);
reportList.add(xjll);
@ -989,7 +987,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
if(data != null && data.getString("resultCode") != null && "0".equals( data.getString("resultCode"))){
return BaseResult.getSuccessMessageEntity("执行成功");
}else {
return BaseResult.getFailureMessageEntity("发送失败："+returndata);
return BaseResult.getFailureMessageEntity("发送失败："+data.getString("message"));
}
}else {
return BaseResult.getFailureMessageEntity("发送失败："+returndata);

42
base-buildpackage/src/main/resources/application-dev.yml Normal file
View File

@ -0,0 +1,42 @@
#######################dev环境#######################
logging:
#日志级别 指定目录级别
level:
root: warn
encodings: GBK
file:
# 日志保存路径
path: /home/webservice/zt/log
spring:
datasource:
dynamic:
datasource:
master:
url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
savefile:
# 文件保存路径
path: /home/webservice/zt/file
# path: D:\webservice\file
# pluginpath: D:\webservice\plugin
pluginpath: /home/webservice/zt/plugin
# tomcatpath: D:\apache-tomcat-9.0.69\webapps\kangarooDataCenter\WEB-INF\classes\
tomcatpath: /home/webservice/zt/tomcatV3/webapps/kangarooDataCenterV3/WEB-INF/classes/
cbs8:
appId: 1P4AGrpz
appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
url: https://cbs8-openapi-reprd.csuat.cmburl.cn
# 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
# 这个私钥到时候上传到cbs，和下面到是同一对
#ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
cbs_public_key: 0469146F06BF3B01236E84632441E826
#电子回单下载临时存放位置
elec_path: /Users/xiangerlin/Downloads/
OA:
data_source_code: yc_oa
zt:
url: http://127.0.0.1:9082/kangarooDataCenterV3/entranceController/externalCallInterface

4
fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/service/impl/InvoiceServiceImpl.java
View File

@ -58,9 +58,9 @@ public class InvoiceServiceImpl extends BaseService<InvoiceEntity, String> imple
@Value("${zt.url}")
private String url;
@Value("${invoice_pdf.url}")
@Value("${invoice_pdf.url:}")
private String invoicePdfUrl;
@Value("${invoice_ofd.url}")
@Value("${invoice_ofd.url:}")
private String invoiceOfdUrl;
@Override