陕西2024版接口-测试调整

czt

2024-11-06 11af6525c78f401f8e7ca1100417adf90415586e

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -1,6 +1,7 @@
package com.fzzy.push.sh2023;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -10,7 +11,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.order.data.OrderData;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -20,7 +20,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.lang.reflect.Field;
import java.util.*;

@@ -92,10 +91,10 @@
            apiLog.setId(ContextUtil.getUUID());

            //若为财务1501、1502、1503接口，则接口编码填写1114
            if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId())
                    || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId())
                    || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) {
                inteId = SH2023Constant.SH_2023_API_CODE_1114;
            if (Constant.API_CODE_1501.equals(param.getInteId())
                    || Constant.API_CODE_1502.equals(param.getInteId())
                    || Constant.API_CODE_1503.equals(param.getInteId())) {
                inteId = Constant.API_CODE_1114;
            }
            apiLog.setInteId(inteId);

@@ -123,8 +122,8 @@

            //获取指令id
            String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
            OrderData orderData = (OrderData) redisUtil.get(key);
            if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
            String orderId = (String) redisUtil.get(key);
            if (StringUtils.isEmpty(orderId)) {
                log.error("指令id失效=" + jsonData);
                ResponseDto responseDto = new ResponseDto(99, "指令id失效");
                apiLog.setStatus(99);
@@ -139,7 +138,7 @@
            //获取身份ID，即行政区划码
            reqData.setUid(conf.getUserName());
            //指令id
            reqData.setOrderid(orderData.getOrderid());
            reqData.setOrderid(orderId);

            //身份签名，使用自有RSA私钥进行加密(地区行政区划代码_当天日期)
            reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
@@ -239,6 +238,12 @@
        } else {
            List<Object> list = new ArrayList<>();
            Object object = getJsonApiData(inteId, data, code);

            //除库存接口外，其他接口上传前更新最后更新时间
            if(!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)){
                setZhgxsjValue(object);
            }

            list.add(object);
            return JSON.toJSONString(list);
        }
@@ -331,6 +336,11 @@
            SH2023Api1107 api1107 = new SH2023Api1107();
            BeanUtils.copyProperties(data, api1107);
            api1107.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1107.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
                api1107.setTykqbm(tykqbm);
            }

            //设置空属性为默认值
            changeObject(api1107);
@@ -340,6 +350,11 @@
            SH2023Api1108 api1108 = new SH2023Api1108();
            BeanUtils.copyProperties(data, api1108);
            api1108.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1108.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
                api1108.setTykqbm(tykqbm);
            }

            //设置空属性为默认值
            changeObject(api1108);
@@ -350,6 +365,11 @@
            Api1109 apiData = (Api1109) data;
            BeanUtils.copyProperties(apiData, api1109);
            api1109.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1109.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
                api1109.setTykqbm(tykqbm);
            }

            Map<String, String> map = new HashMap<>();
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
@@ -367,6 +387,12 @@
            Api1110 apiData = (Api1110) data;
            BeanUtils.copyProperties(apiData, api1110);
            api1110.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1110.getTyajbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
                api1110.setTyajbm(tyhwbm);
            }

            api1110.setAjdm(apiData.getHwdm().substring(0, 28));
            api1110.setAjxdwz(apiData.getHwxdwz());
            api1110.setAjwzys(apiData.getHwwzys());
@@ -379,6 +405,11 @@
            SH2023Api1111 api1111 = new SH2023Api1111();
            BeanUtils.copyProperties(data, api1111);
            api1111.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1111.getTykqbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
                api1111.setTykqbm(tyhwbm);
            }

            //设置空属性为默认值
            changeObject(api1111);
@@ -390,6 +421,16 @@
            api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
            api1112.setBjw(ShAreaBjw.getBjw(code));
            api1112.setZy("01");
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1112.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
                api1112.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1112.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
                api1112.setTykqbm(tykqbm);
            }

            //设置空属性为默认值
            changeObject(api1112);
@@ -399,15 +440,33 @@
            SH2023Api1113 api1113 = new SH2023Api1113();
            BeanUtils.copyProperties(data, api1113);
            api1113.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1113.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
                api1113.setTydwbm(tydwbm);
            }
            //设置空属性为默认值
            changeObject(api1113);
            return api1113;
        }
        //数据相符性接口
        if (SH2023Constant.SH_2023_API_CODE_1115.equals(inteId)) {
            SH2023Api1115 api1115 = new SH2023Api1115();
            BeanUtils.copyProperties(data, api1115);
            api1115.setBjw(ShAreaBjw.getBjw(code));
            //设置空属性为默认值
            changeObject(api1115);
            return api1115;
        }
        if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
            SH2023Api1201 api1201 = new SH2023Api1201();
            BeanUtils.copyProperties(data, api1201);
            api1201.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1201.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
                api1201.setTydwbm(tydwbm);
            }
            api1201.setHtsfzz("0");
            //合同签订地点不能为空或填无
            if (StringUtils.isEmpty(api1201.getQddd())) {
@@ -431,6 +490,11 @@
            Api1202 apiData = (Api1202) data;
            BeanUtils.copyProperties(apiData, api1202);
            api1202.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1202.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
                api1202.setTyhwbm(tyhwbm);
            }
            api1202.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1202.getCddm())) {
                api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -441,7 +505,9 @@
            //设置粮食轮换年度,根据计划明细号查询计划明细，再根据计划明细查询轮换计划
            List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
            if (null != api1404List && api1404List.size() > 0) {
                api1202.setShnd(api1404List.get(0).getShnd());
                if(StringUtils.isEmpty(api1202.getShnd())){
                    api1202.setShnd(api1404List.get(0).getShnd());
                }
                List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
                if(null != api1403List && api1403List.size() > 0){
                    if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
@@ -471,6 +537,11 @@
            Api1203 apiData = (Api1203) data;
            BeanUtils.copyProperties(apiData, api1203);
            api1203.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1203.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
                api1203.setTyhwbm(tyhwbm);
            }
            if (StringUtils.isEmpty(api1203.getJyxm())) {
                api1203.setJyxm("0");
            }
@@ -505,7 +576,11 @@
            Api1204 apiData = (Api1204) data;
            BeanUtils.copyProperties(apiData, api1204);
            api1204.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1204.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
                api1204.setTyhwbm(tyhwbm);
            }
            //设置批次号
            if (StringUtils.isNotEmpty(api1204.getHth())) {
                List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
@@ -533,7 +608,11 @@
            Api1205 apiData = (Api1205) data;
            BeanUtils.copyProperties(apiData, api1205);
            api1205.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1205.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
                api1205.setTyhwbm(tyhwbm);
            }
            api1205.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1205.getCddm())) {
                api1205.setCddm(api1205.getHwdm().substring(2, 8));
@@ -545,6 +624,9 @@
            //设置粮食轮换年度
            List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
            if (null != api1404List && api1404List.size() > 0) {
                if(StringUtils.isEmpty(api1205.getShnd())){
                    api1205.setShnd(api1404List.get(0).getShnd());
                }
                List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
                if(null != api1403List && api1403List.size() > 0){
                    if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
@@ -559,8 +641,6 @@
                api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //粮食性质
            api1205.setLsxzdm("200");
            //设置空属性为默认值
            changeObject(api1205);
            return api1205;
@@ -570,6 +650,11 @@
            Api1206 apiData = (Api1206) data;
            BeanUtils.copyProperties(apiData, api1206);
            api1206.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1206.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1206.setTykqbm(tykqbm);
            }
            //批次号
            if (StringUtils.isNotEmpty(api1206.getHth())) {
                List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
@@ -578,6 +663,12 @@
                    if (null != api1208List && api1208List.size() > 0) {
                        api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
                    }
                }
            }
            if (StringUtils.isNotEmpty(apiData.getHwdm())) {
                List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
                if (null != api1208List && api1208List.size() > 0) {
                    api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
                }
            }
            //设置空属性为默认值
@@ -592,6 +683,16 @@

            api1207.setDcrq(apiData.getDcrq());
            api1207.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1207.getDcdwtybm())){
                String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
                api1207.setDcdwtybm(dckqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1207.getDchwtybm())){
                String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
                api1207.setDchwtybm(dchwtybm);
            }

            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
            if (null != api1208List && api1208List.size() > 0) {
@@ -609,6 +710,16 @@
            api1208.setZglkdm(api1208.getHwdm().substring(0, 21));

            api1208.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getZglktybm())){
                String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
                api1208.setZglktybm(lqgstydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                api1208.setTyhwbm(tyhwbm);
            }
            //设置批次号
            api1208.setPch(apiData.getHwdm() + apiData.getShnd());
            if (StringUtils.isEmpty(api1208.getCd())) {
@@ -640,7 +751,11 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
            }

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1209.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
                api1209.setTyhwbm(tyhwbm);
            }
            //粮食性质,暂时默认区级储备
            api1209.setLsxzdm("122");

@@ -654,6 +769,11 @@

            BeanUtils.copyProperties(apiData, api1210);
            api1210.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1210.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
                api1210.setTyhwbm(tyhwbm);
            }
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -688,6 +808,11 @@
            BeanUtils.copyProperties(apiData, api1211);
            api1211.setZglkdm(api1211.getKqdm());
            api1211.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
                api1211.setTyhwbm(tyhwbm);
            }
            api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
@@ -695,6 +820,11 @@
            }
            //主管粮库代码
            api1211.setZglkdm(apiData.getKqdm());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getZglktybm())){
                String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
                api1211.setZglktybm(zglktybm);
            }
            //设置空属性为默认值
            changeObject(api1211);
            return api1211;
@@ -703,7 +833,16 @@
            SH2023Api1212 api1212 = new SH2023Api1212();
            BeanUtils.copyProperties(data, api1212);
            api1212.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1212.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
                api1212.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1212.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
                api1212.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1212);
            return api1212;
@@ -712,7 +851,11 @@
            SH2023Api1301 api1301 = new SH2023Api1301();
            BeanUtils.copyProperties(data, api1301);
            api1301.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1301.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
                api1301.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1301);
            return api1301;
@@ -722,6 +865,11 @@
            Api1302 apiData = (Api1302) data;
            BeanUtils.copyProperties(apiData, api1302);
            api1302.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1302.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
                api1302.setTyhwbm(tyhwbm);
            }
            api1302.setLqjs("1");
            //批次号
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
@@ -740,6 +888,11 @@
            Api1303 apiData = (Api1303) data;
            BeanUtils.copyProperties(apiData, api1303);
            api1303.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1303.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
                api1303.setTyhwbm(tyhwbm);
            }
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -753,6 +906,11 @@
            Api1304 apiData = (Api1304) data;
            BeanUtils.copyProperties(apiData, api1304);
            api1304.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1304.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
                api1304.setTyhwbm(tyhwbm);
            }
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -768,6 +926,11 @@
            BeanUtils.copyProperties(apiData, api1305);
            api1305.setBjw(ShAreaBjw.getBjw(code));
            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1305.getTyajbm())){
                String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
                api1305.setTyajbm(tyajbm);
            }
            //上海通风作业单号：廒间代码+yyyyMMdd+3位顺序号
            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
            api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
@@ -783,10 +946,19 @@
            Api1306 apiData = (Api1306) data;
            BeanUtils.copyProperties(apiData, api1306);
            api1306.setBjw(ShAreaBjw.getBjw(code));
            api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
            api1306.setAjdm(apiData.getHwdm().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1306.getTyajbm())){
                String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
                api1306.setTyajbm(tyajbm);
            }
            //上海熏蒸作业单号：货位代码+yyyyMMdd + 3位顺序号
            api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
            //设置批次号
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1306.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }
            if (StringUtils.isEmpty(api1306.getSyff())) {
                api1306.setSyff("0"); //潮解法
            }
@@ -800,7 +972,21 @@
            BeanUtils.copyProperties(apiData, api1307);
            api1307.setBjw(ShAreaBjw.getBjw(code));
            api1307.setAjdm(apiData.getHwdm().substring(0, 28));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
                api1307.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyajbm())){
                String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
                api1307.setTyajbm(tyajbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
                api1307.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(api1307);
            return api1307;
@@ -811,7 +997,16 @@

            BeanUtils.copyProperties(apiData, api1308);
            api1308.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
                api1308.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
                api1308.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(api1308);
            return api1308;
@@ -820,6 +1015,11 @@
            SH2023Api1309 api1309 = new SH2023Api1309();
            BeanUtils.copyProperties(data, api1309);
            api1309.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1309.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
                api1309.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1309);
            return api1309;
@@ -830,7 +1030,11 @@
            BeanUtils.copyProperties(apiData, api1310);
            api1310.setBjw(ShAreaBjw.getBjw(code));
            api1310.setJyrq(apiData.getJysj());

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1310.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
                api1310.setTyhwbm(tyhwbm);
            }
            if (StringUtils.isEmpty(api1310.getJyxm())) {
                api1310.setJyxm("0");
            }
@@ -839,7 +1043,7 @@
            }
            String lsxzdm = "122";
            String pch = "";
            List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1310.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                if (StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())) {
                    lsxzdm = api1208List.get(0).getLsxzdm();
@@ -873,7 +1077,11 @@
            SH2023Api1311 api1311 = new SH2023Api1311();
            BeanUtils.copyProperties(data, api1311);
            api1311.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1311.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
                api1311.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1311);
            return api1311;
@@ -882,7 +1090,11 @@
            SH2023Api1401 api1401 = new SH2023Api1401();
            BeanUtils.copyProperties(data, api1401);
            api1401.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1401.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
                api1401.setTydwbm(tydwbm);
            }
            //设置空属性为默认值
            changeObject(api1401);
            return api1401;
@@ -905,7 +1117,11 @@
            api1403.setJhzxdw(api1101List.get(0).getDwdm());
            api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
            api1403.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1403.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1403.getJhzxdw());
                api1403.setTydwbm(tydwbm);
            }
            //查询轮换计划的轮入数量和轮出数量
            List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
            Double lrsl = 0.0, lcsl = 0.0; //用于统计轮入数量和轮出数量
@@ -931,7 +1147,11 @@
            BeanUtils.copyProperties(data, api1404);
            api1404.setMxzt("1");
            api1404.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1404.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
                api1404.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(api1404);
            return api1404;
@@ -948,6 +1168,17 @@
            if (null != api1208List && api1208List.size() > 0) {
                apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDrdwtybm())){
                String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
                apiData.setDrdwtybm(drkqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDrhwtybm())){
                String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
                apiData.setDrhwtybm(drhwtybm);
            }

            //设置空属性为默认值
            changeObject(apiData);
            return apiData;
@@ -955,6 +1186,11 @@
        if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
            SH2023Api2103 apiData = new SH2023Api2103();
            BeanUtils.copyProperties(data, apiData);
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(apiData);
            return apiData;
@@ -978,6 +1214,23 @@
        //设置空属性为默认值
        changeObject(data);
        return data;
    }

    /**
     * 赋值最后更新时间
     * @param object
     * @return
     */
    private Object setZhgxsjValue(Object object) {
        // 使用反射获取属性列表 vo为实体对象名
        try {
            Field zhgxsj = object.getClass().getDeclaredField("zhgxsj");
            zhgxsj.setAccessible(true);
            zhgxsj.set(object, new Date());
        } catch (Exception e) {
            e.printStackTrace();
        }
        return object;
    }

    /**
@@ -1122,48 +1375,59 @@
        List<SHFinanceDto> list = new ArrayList<>();
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        shFinanceDto.setDwdm(api1503.getDwdm());
        shFinanceDto.setKqdm(api1503.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
        shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
        shFinanceDto.setBbm("03");
        shFinanceDto.setCzbz(api1503.getCzbz());
        shFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        paddingData(shFinanceDto, list, "项目//t", "本期金额//t", "本年累计//t");
        paddingData(shFinanceDto, list, "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
        paddingData(shFinanceDto, list, "减：营业成本", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
        paddingData(shFinanceDto, list, "税金及附加", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
        paddingData(shFinanceDto, list, "销售费用", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
        paddingData(shFinanceDto, list, "管理费用", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
        paddingData(shFinanceDto, list, "研发费用", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
        paddingData(shFinanceDto, list, "财务费用", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
        paddingData(shFinanceDto, list, "其中：利息费用", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
        paddingData(shFinanceDto, list, "利息收入", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
        paddingData(shFinanceDto, list, "加：其他收益", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
        paddingData(shFinanceDto, list, "投资收益（损失以“-”号填列）", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
        paddingData(shFinanceDto, list, "其中：对联营企业和合营企业的投资收益", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
        paddingData(shFinanceDto, list, "公允价值变动收益（损失以“-”号填列）", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
        paddingData(shFinanceDto, list, "资产减值损失（损失以“-”号填列）", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
        paddingData(shFinanceDto, list, "资产处置收益（损失以“-”号填列）", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
        paddingData(shFinanceDto, list, "二、营业利润（亏损以“-”号填列）", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
        paddingData(shFinanceDto, list, "加：营业外收入", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
        paddingData(shFinanceDto, list, "减：营业外支出", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
        paddingData(shFinanceDto, list, "三、利润总额（亏损总额以“-”号填列）", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
        paddingData(shFinanceDto, list, "减：所得税费用", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
        paddingData(shFinanceDto, list, "四、净利润（净亏损以“-”号填列）", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
        paddingData(shFinanceDto, list, "（一）持续经营净利润（净亏损以“-”号填列）", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
        paddingData(shFinanceDto, list, "（二）终止经营净利润（净亏损以“-”号填列）", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
        paddingData(shFinanceDto, list, "五、其他综合收益的税后净额", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
        paddingData(shFinanceDto, list, "（一）不能重分类进损益的其他综合收益", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
        paddingData(shFinanceDto, list, "1．重新计量设定受益计划变动额", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
        paddingData(shFinanceDto, list, "（二）将重分类进损益的其他综合收益", "0", "0");
        paddingData(shFinanceDto, list, "1．权益法下可转损益的其他综合收益", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
        paddingData(shFinanceDto, list, "2．可供出售金融资产公允价值变动损益", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
        paddingData(shFinanceDto, list, "3．持有至到期投资重分类为可供出售金融资产损益", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
        paddingData(shFinanceDto, list, "4．现金流量套期损益的有效部分", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
        paddingData(shFinanceDto, list, "5．外币财务报表折算差额", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
        paddingData(shFinanceDto, list, "六、综合收益总额", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
        paddingData(shFinanceDto, list, "七、每股收益：", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
        paddingData(shFinanceDto, list, "（一）基本每股收益", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
        paddingData(shFinanceDto, list, "（二）稀释每股收益", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
        paddingData(shFinanceDto, list, "0",  "项目//t", "本期金额//t", "本年累计//t");
        paddingData(shFinanceDto, list, "1",  "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
        paddingData(shFinanceDto, list, "2",  "减：营业成本", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
        paddingData(shFinanceDto, list, "3",  "税金及附加", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
        paddingData(shFinanceDto, list, "4",  "销售费用", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
        paddingData(shFinanceDto, list, "5",  "管理费用", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
        paddingData(shFinanceDto, list, "6",  "研发费用", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
        paddingData(shFinanceDto, list, "7",  "财务费用", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
        paddingData(shFinanceDto, list, "8",  "其中：利息费用", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
        paddingData(shFinanceDto, list, "9",  "利息收入", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
        paddingData(shFinanceDto, list, "10", "加：其他收益", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
        paddingData(shFinanceDto, list, "11", "投资收益（损失以“-”号填列）", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
        paddingData(shFinanceDto, list, "12", "其中：对联营企业和合营企业的投资收益", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
        paddingData(shFinanceDto, list, "13", "公允价值变动收益（损失以“-”号填列）", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
        paddingData(shFinanceDto, list, "14", "资产减值损失（损失以“-”号填列）", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
        paddingData(shFinanceDto, list, "15", "资产处置收益（损失以“-”号填列）", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
        paddingData(shFinanceDto, list, "16", "二、营业利润（亏损以“-”号填列）", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
        paddingData(shFinanceDto, list, "17", "加：营业外收入", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
        paddingData(shFinanceDto, list, "18", "减：营业外支出", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
        paddingData(shFinanceDto, list, "19", "三、利润总额（亏损总额以“-”号填列）", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
        paddingData(shFinanceDto, list, "20", "减：所得税费用", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
        paddingData(shFinanceDto, list, "21", "四、净利润（净亏损以“-”号填列）", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
        paddingData(shFinanceDto, list, "22", "（一）持续经营净利润（净亏损以“-”号填列）", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
        paddingData(shFinanceDto, list, "23", "（二）终止经营净利润（净亏损以“-”号填列）", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
        paddingData(shFinanceDto, list, "24", "五、其他综合收益的税后净额", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
        paddingData(shFinanceDto, list, "25", "（一）不能重分类进损益的其他综合收益", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
        paddingData(shFinanceDto, list, "26", "1．重新计量设定受益计划变动额", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
        paddingData(shFinanceDto, list, "27", "（二）将重分类进损益的其他综合收益", "0", "0");
        paddingData(shFinanceDto, list, "28", "1．权益法下可转损益的其他综合收益", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
        paddingData(shFinanceDto, list, "29", "2．可供出售金融资产公允价值变动损益", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
        paddingData(shFinanceDto, list, "30", "3．持有至到期投资重分类为可供出售金融资产损益", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
        paddingData(shFinanceDto, list, "31", "4．现金流量套期损益的有效部分", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
        paddingData(shFinanceDto, list, "32", "5．外币财务报表折算差额", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
        paddingData(shFinanceDto, list, "33", "六、综合收益总额", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
        paddingData(shFinanceDto, list, "34", "七、每股收益：", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
        paddingData(shFinanceDto, list, "35", "（一）基本每股收益", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
        paddingData(shFinanceDto, list, "36", "（二）稀释每股收益", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");

        return list;
    }
@@ -1172,50 +1436,61 @@
        List<SHFinanceDto> list = new ArrayList<>();
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        shFinanceDto.setDwdm(api1502.getDwdm());
        shFinanceDto.setKqdm(api1502.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
        shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
        shFinanceDto.setBbm("02");
        shFinanceDto.setCzbz(api1502.getCzbz());
        shFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        paddingData(shFinanceDto, list, "项目//t", "本月数//t", "本年累计数//t");
        paddingData(shFinanceDto, list, "一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
        paddingData(shFinanceDto, list, "销售商品、提供劳务收到的现金", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
        paddingData(shFinanceDto, list, "收到的税费返还", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
        paddingData(shFinanceDto, list, "收到其他与经营活动有关的现金", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
        paddingData(shFinanceDto, list, "经营活动现金流入小计", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
        paddingData(shFinanceDto, list, "购买商品、接受劳务支付的现金", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
        paddingData(shFinanceDto, list, "支付给职工以及为职工支付的现金", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
        paddingData(shFinanceDto, list, "支付的各项税费", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
        paddingData(shFinanceDto, list, "支付其他与经营活动有关的现金", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
        paddingData(shFinanceDto, list, "经营活动现金流出小计", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
        paddingData(shFinanceDto, list, "经营活动产生的现金流量净额", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
        paddingData(shFinanceDto, list, "二、投资活动产生的现金流量：", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
        paddingData(shFinanceDto, list, "收回投资收到的现金", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
        paddingData(shFinanceDto, list, "取得投资收益收到的现金", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
        paddingData(shFinanceDto, list, "处置固定资产、无形资产和其他长期资产收回的现金净额", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
        paddingData(shFinanceDto, list, "处置子公司及其他营业单位收到的现金净额", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
        paddingData(shFinanceDto, list, "收到其他与投资活动有关的现金", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
        paddingData(shFinanceDto, list, "投资活动现金流入小计", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
        paddingData(shFinanceDto, list, "购建固定资产、无形资产和其他长期资产支付的现金", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
        paddingData(shFinanceDto, list, "投资支付的现金", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
        paddingData(shFinanceDto, list, "取得子公司及其他营业单位支付的现金净额", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
        paddingData(shFinanceDto, list, "支付其他与投资活动有关的现金", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
        paddingData(shFinanceDto, list, "投资活动现金流出小计", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
        paddingData(shFinanceDto, list, "投资活动产生的现金流量净额", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
        paddingData(shFinanceDto, list, "三、筹资活动产生的现金流量：", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
        paddingData(shFinanceDto, list, "吸收投资收到的现金", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
        paddingData(shFinanceDto, list, "取得借款收到的现金", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
        paddingData(shFinanceDto, list, "收到其他与筹资活动有关的现金", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
        paddingData(shFinanceDto, list, "筹资活动现金流入小计", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
        paddingData(shFinanceDto, list, "偿还债务支付的现金", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
        paddingData(shFinanceDto, list, "分配股利、利润或偿付利息支付的现金", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
        paddingData(shFinanceDto, list, "支付其他与筹资活动有关的现金", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
        paddingData(shFinanceDto, list, "筹资活动现金流出小计", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
        paddingData(shFinanceDto, list, "筹资活动产生的现金流量净额", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
        paddingData(shFinanceDto, list, "四、汇率变动对现金及现金等价物的影响", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
        paddingData(shFinanceDto, list, "五、现金及现金等价物净增加额", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
        paddingData(shFinanceDto, list, "加：期初现金及现金等价物余额", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
        paddingData(shFinanceDto, list, "六、期末现金及现金等价物余额", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
        paddingData(shFinanceDto, list, "0",  "项目//t", "本月数//t", "本年累计数//t");
        paddingData(shFinanceDto, list, "1",  "一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
        paddingData(shFinanceDto, list, "2",  "销售商品、提供劳务收到的现金", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
        paddingData(shFinanceDto, list, "3",  "收到的税费返还", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
        paddingData(shFinanceDto, list, "4",  "收到其他与经营活动有关的现金", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
        paddingData(shFinanceDto, list, "5",  "经营活动现金流入小计", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
        paddingData(shFinanceDto, list, "6",  "购买商品、接受劳务支付的现金", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
        paddingData(shFinanceDto, list, "7",  "支付给职工以及为职工支付的现金", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
        paddingData(shFinanceDto, list, "8",  "支付的各项税费", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
        paddingData(shFinanceDto, list, "9",  "支付其他与经营活动有关的现金", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
        paddingData(shFinanceDto, list, "10", "经营活动现金流出小计", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
        paddingData(shFinanceDto, list, "11", "经营活动产生的现金流量净额", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
        paddingData(shFinanceDto, list, "12", "二、投资活动产生的现金流量：", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
        paddingData(shFinanceDto, list, "13", "收回投资收到的现金", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
        paddingData(shFinanceDto, list, "14", "取得投资收益收到的现金", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
        paddingData(shFinanceDto, list, "15", "处置固定资产、无形资产和其他长期资产收回的现金净额", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
        paddingData(shFinanceDto, list, "16", "处置子公司及其他营业单位收到的现金净额", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
        paddingData(shFinanceDto, list, "17", "收到其他与投资活动有关的现金", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
        paddingData(shFinanceDto, list, "18", "投资活动现金流入小计", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
        paddingData(shFinanceDto, list, "19", "购建固定资产、无形资产和其他长期资产支付的现金", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
        paddingData(shFinanceDto, list, "20", "投资支付的现金", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
        paddingData(shFinanceDto, list, "21", "取得子公司及其他营业单位支付的现金净额", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
        paddingData(shFinanceDto, list, "22", "支付其他与投资活动有关的现金", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
        paddingData(shFinanceDto, list, "23", "投资活动现金流出小计", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
        paddingData(shFinanceDto, list, "24", "投资活动产生的现金流量净额", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
        paddingData(shFinanceDto, list, "25", "三、筹资活动产生的现金流量：", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
        paddingData(shFinanceDto, list, "26", "吸收投资收到的现金", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
        paddingData(shFinanceDto, list, "27", "取得借款收到的现金", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
        paddingData(shFinanceDto, list, "28", "收到其他与筹资活动有关的现金", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
        paddingData(shFinanceDto, list, "29", "筹资活动现金流入小计", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
        paddingData(shFinanceDto, list, "30", "偿还债务支付的现金", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
        paddingData(shFinanceDto, list, "31", "分配股利、利润或偿付利息支付的现金", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
        paddingData(shFinanceDto, list, "32", "支付其他与筹资活动有关的现金", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
        paddingData(shFinanceDto, list, "33", "筹资活动现金流出小计", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
        paddingData(shFinanceDto, list, "34", "筹资活动产生的现金流量净额", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
        paddingData(shFinanceDto, list, "35", "四、汇率变动对现金及现金等价物的影响", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
        paddingData(shFinanceDto, list, "36", "五、现金及现金等价物净增加额", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
        paddingData(shFinanceDto, list, "37", "加：期初现金及现金等价物余额", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
        paddingData(shFinanceDto, list, "38", "六、期末现金及现金等价物余额", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");

        return list;
    }
@@ -1224,93 +1499,105 @@
        List<SHFinanceDto> list = new ArrayList<>();
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        shFinanceDto.setDwdm(api1501.getDwdm());
        shFinanceDto.setKqdm(api1501.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
        shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
        shFinanceDto.setBbm("01");
        shFinanceDto.setCzbz(api1501.getCzbz());
        shFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        paddingData(shFinanceDto, list, "资产//t", "期末余额//t", "年初余额//t");
        paddingData(shFinanceDto, list, "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(shFinanceDto, list, "货币资金", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
        paddingData(shFinanceDto, list, "交易性金融资产", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
        paddingData(shFinanceDto, list, "衍生金融资产", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
        paddingData(shFinanceDto, list, "应收票据", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
        paddingData(shFinanceDto, list, "应收账款", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
        paddingData(shFinanceDto, list, "预付款项", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
        paddingData(shFinanceDto, list, "其他应收款", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
        paddingData(shFinanceDto, list, "存货", api1501.getChqmye() + "", api1501.getChncye() + "");
        paddingData(shFinanceDto, list, "合同资产", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
        paddingData(shFinanceDto, list, "持有待售资产", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
        paddingData(shFinanceDto, list, "一年内到期的非流动资产", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
        paddingData(shFinanceDto, list, "其他流动资产", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
        paddingData(shFinanceDto, list, "流动资产合计", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(shFinanceDto, list, "非流动资产：", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
        paddingData(shFinanceDto, list, "债券投资", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
        paddingData(shFinanceDto, list, "其他债券投资", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
        paddingData(shFinanceDto, list, "长期应收款", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
        paddingData(shFinanceDto, list, "长期股权投资", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
        paddingData(shFinanceDto, list, "其他权益工具投资", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
        paddingData(shFinanceDto, list, "其他非流动金融资产", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
        paddingData(shFinanceDto, list, "投资性房地产", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
        paddingData(shFinanceDto, list, "固定资产", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
        paddingData(shFinanceDto, list, "在建工程", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
        paddingData(shFinanceDto, list, "生产性生物资产", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
        paddingData(shFinanceDto, list, "油气资产", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
        paddingData(shFinanceDto, list, "无形资产", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
        paddingData(shFinanceDto, list, "开发支出", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
        paddingData(shFinanceDto, list, "商誉", api1501.getSyqmye() + "", api1501.getSyncye() + "");
        paddingData(shFinanceDto, list, "长期待摊费用", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
        paddingData(shFinanceDto, list, "递延所得税资产", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
        paddingData(shFinanceDto, list, "其他非流动资产", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
        paddingData(shFinanceDto, list, "非流动资产合计", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
        paddingData(shFinanceDto, list, "资产总计", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
        paddingData(shFinanceDto, list, "负债和所有者权益（或股东权益）//t", "期末余额//t", "年初余额//t");
        paddingData(shFinanceDto, list, "流动负债：", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
        paddingData(shFinanceDto, list, "短期借款", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(shFinanceDto, list, "交易性金融负债", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
        paddingData(shFinanceDto, list, "衍生金融负债", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
        paddingData(shFinanceDto, list, "应付票据", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
        paddingData(shFinanceDto, list, "应付账款", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
        paddingData(shFinanceDto, list, "预收款项", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
        paddingData(shFinanceDto, list, "合同负债", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
        paddingData(shFinanceDto, list, "应付职工薪酬", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
        paddingData(shFinanceDto, list, "应交税费", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
        paddingData(shFinanceDto, list, "其他应付款", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
        paddingData(shFinanceDto, list, "持有待售负债", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
        paddingData(shFinanceDto, list, "一年内到期的非流动负债", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
        paddingData(shFinanceDto, list, "其他流动负债", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
        paddingData(shFinanceDto, list, "流动负债合计", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
        paddingData(shFinanceDto, list, "非流动负债：", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
        paddingData(shFinanceDto, list, "长期借款", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
        paddingData(shFinanceDto, list, "应付债券", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
        paddingData(shFinanceDto, list, "其中：优先股", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
        paddingData(shFinanceDto, list, "永续债", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
        paddingData(shFinanceDto, list, "长期应付款", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
        paddingData(shFinanceDto, list, "预计负债", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
        paddingData(shFinanceDto, list, "递延收益", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
        paddingData(shFinanceDto, list, "递延所得税负债", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
        paddingData(shFinanceDto, list, "其他非流动负债", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
        paddingData(shFinanceDto, list, "非流动负债合计", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
        paddingData(shFinanceDto, list, "负债合计", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
        paddingData(shFinanceDto, list, "所有者权益（或股东权益）：", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
        paddingData(shFinanceDto, list, "实收资本（或股本）", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
        paddingData(shFinanceDto, list, "其他权益工具", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
        paddingData(shFinanceDto, list, "其中：优先股", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
        paddingData(shFinanceDto, list, "永续债", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
        paddingData(shFinanceDto, list, "资本公积", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
        paddingData(shFinanceDto, list, "减：库存股", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
        paddingData(shFinanceDto, list, "其他综合收益", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
        paddingData(shFinanceDto, list, "专项储备", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
        paddingData(shFinanceDto, list, "盈余公积", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
        paddingData(shFinanceDto, list, "未分配利润", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
        paddingData(shFinanceDto, list, "所有者权益（或股东权益）合计", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
        paddingData(shFinanceDto, list, "负债和所有者权益（或股东权益）总计", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
        paddingData(shFinanceDto, list, "0",  "资产//t", "期末余额//t", "年初余额//t");
        paddingData(shFinanceDto, list, "1",  "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(shFinanceDto, list, "2",  "货币资金", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
        paddingData(shFinanceDto, list, "3",  "交易性金融资产", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
        paddingData(shFinanceDto, list, "4",  "衍生金融资产", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
        paddingData(shFinanceDto, list, "5",  "应收票据", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
        paddingData(shFinanceDto, list, "6",  "应收账款", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
        paddingData(shFinanceDto, list, "7",  "预付款项", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
        paddingData(shFinanceDto, list, "8",  "其他应收款", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
        paddingData(shFinanceDto, list, "9",  "存货", api1501.getChqmye() + "", api1501.getChncye() + "");
        paddingData(shFinanceDto, list, "10", "合同资产", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
        paddingData(shFinanceDto, list, "11", "持有待售资产", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
        paddingData(shFinanceDto, list, "12", "一年内到期的非流动资产", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
        paddingData(shFinanceDto, list, "13", "其他流动资产", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
        paddingData(shFinanceDto, list, "14", "流动资产合计", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(shFinanceDto, list, "15", "非流动资产：", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
        paddingData(shFinanceDto, list, "16", "债券投资", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
        paddingData(shFinanceDto, list, "17", "其他债券投资", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
        paddingData(shFinanceDto, list, "18", "长期应收款", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
        paddingData(shFinanceDto, list, "19", "长期股权投资", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
        paddingData(shFinanceDto, list, "20", "其他权益工具投资", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
        paddingData(shFinanceDto, list, "21", "其他非流动金融资产", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
        paddingData(shFinanceDto, list, "22", "投资性房地产", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
        paddingData(shFinanceDto, list, "23", "固定资产", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
        paddingData(shFinanceDto, list, "24", "在建工程", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
        paddingData(shFinanceDto, list, "25", "生产性生物资产", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
        paddingData(shFinanceDto, list, "26", "油气资产", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
        paddingData(shFinanceDto, list, "27", "无形资产", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
        paddingData(shFinanceDto, list, "28", "开发支出", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
        paddingData(shFinanceDto, list, "29", "商誉", api1501.getSyqmye() + "", api1501.getSyncye() + "");
        paddingData(shFinanceDto, list, "30", "长期待摊费用", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
        paddingData(shFinanceDto, list, "31", "递延所得税资产", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
        paddingData(shFinanceDto, list, "32", "其他非流动资产", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
        paddingData(shFinanceDto, list, "33", "非流动资产合计", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
        paddingData(shFinanceDto, list, "34", "资产总计", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
        paddingData(shFinanceDto, list, "35", "负债和所有者权益（或股东权益）//t", "期末余额//t", "年初余额//t");
        paddingData(shFinanceDto, list, "36", "流动负债：", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
        paddingData(shFinanceDto, list, "37", "短期借款", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(shFinanceDto, list, "38", "交易性金融负债", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
        paddingData(shFinanceDto, list, "39", "衍生金融负债", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
        paddingData(shFinanceDto, list, "40", "应付票据", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
        paddingData(shFinanceDto, list, "41", "应付账款", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
        paddingData(shFinanceDto, list, "42", "预收款项", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
        paddingData(shFinanceDto, list, "43", "合同负债", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
        paddingData(shFinanceDto, list, "44", "应付职工薪酬", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
        paddingData(shFinanceDto, list, "45", "应交税费", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
        paddingData(shFinanceDto, list, "46", "其他应付款", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
        paddingData(shFinanceDto, list, "47", "持有待售负债", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
        paddingData(shFinanceDto, list, "48", "一年内到期的非流动负债", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
        paddingData(shFinanceDto, list, "49", "其他流动负债", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
        paddingData(shFinanceDto, list, "50", "流动负债合计", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
        paddingData(shFinanceDto, list, "51", "非流动负债：", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
        paddingData(shFinanceDto, list, "52", "长期借款", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
        paddingData(shFinanceDto, list, "53", "应付债券", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
        paddingData(shFinanceDto, list, "54", "其中：优先股", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
        paddingData(shFinanceDto, list, "55", "永续债", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
        paddingData(shFinanceDto, list, "56", "长期应付款", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
        paddingData(shFinanceDto, list, "57", "预计负债", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
        paddingData(shFinanceDto, list, "58", "递延收益", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
        paddingData(shFinanceDto, list, "59", "递延所得税负债", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
        paddingData(shFinanceDto, list, "60", "其他非流动负债", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
        paddingData(shFinanceDto, list, "61", "非流动负债合计", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
        paddingData(shFinanceDto, list, "62", "负债合计", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
        paddingData(shFinanceDto, list, "63", "所有者权益（或股东权益）：", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
        paddingData(shFinanceDto, list, "64", "实收资本（或股本）", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
        paddingData(shFinanceDto, list, "65", "其他权益工具", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
        paddingData(shFinanceDto, list, "66", "其中：优先股", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
        paddingData(shFinanceDto, list, "67", "永续债", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
        paddingData(shFinanceDto, list, "68", "资本公积", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
        paddingData(shFinanceDto, list, "69", "减：库存股", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
        paddingData(shFinanceDto, list, "70", "其他综合收益", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
        paddingData(shFinanceDto, list, "71", "专项储备", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
        paddingData(shFinanceDto, list, "72", "盈余公积", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
        paddingData(shFinanceDto, list, "73", "未分配利润", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
        paddingData(shFinanceDto, list, "74", "所有者权益（或股东权益）合计", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
        paddingData(shFinanceDto, list, "75", "负债和所有者权益（或股东权益）总计", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
        return list;
    }

    private void paddingData(SHFinanceDto common, List<SHFinanceDto> list, String zbmc, String zbz1, String zbz2) {
    private void paddingData(SHFinanceDto common, List<SHFinanceDto> list, String zbxh, String zbmc, String zbz1, String zbz2) {
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        BeanUtils.copyProperties(common, shFinanceDto);
        shFinanceDto.setZbxh(zbxh);
        shFinanceDto.setZbmc(zbmc);
        shFinanceDto.setZbz1(zbz1);
        shFinanceDto.setZbz2(zbz2);
@@ -1330,7 +1617,7 @@
    }
    private String getYwdh(String wjlx, String wjmc, String ywdh) {
        String[] s = wjmc.split("_");
        if ("2".equals(wjlx) || "3".equals(wjlx)) {
        if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
            ywdh = s[1];
        }
        return ywdh;