同步与上传调整

YYC

2025-03-07 aee5c93d9d8f904d84ecdfff6025ddace615c6b2

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

@@ -23,6 +23,7 @@
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.*;

@@ -49,6 +50,8 @@
    private Api1101Rep api1101Rep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api9110Rep api9110Rep;
    @Autowired
    private Api1103Rep api1103Rep;
    @Autowired
@@ -84,8 +87,17 @@
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {

        String kqdm = param.getKqdm();
        //查询库区信息行政区划码
        List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
        String xzqhdm = "";
        if (param.getInteId().startsWith("91")) {
            //查询库区信息行政区划码
            List<Api9110> api9110List = api9110Rep.findPushData(kqdm);
            xzqhdm = api9110List.get(0).getXzqhdm();
        } else {
            //查询库区信息行政区划码
            List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
            xzqhdm = api1102List.get(0).getXzqhdm();
        }

        try {
            if (null == conf) {
                conf = apiCommonService.getConf(kqdm);
@@ -106,7 +118,7 @@
            //获取接口编码
            String inteId = this.getInteId(param.getInteId());
            //获取JSON报文
            String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
            String jsonData = getJsonData(param.getInteId(), data, xzqhdm);
            log.info("接口数据信息=" + jsonData);
            apiLog.setData(jsonData);
            apiLog.setKqdm(kqdm);
@@ -197,7 +209,8 @@
            }

            //封装数据
            SH2023PullReqDto reqData = new SH2023PullReqDto();;
            SH2023PullReqDto reqData = new SH2023PullReqDto();
            ;

            reqData.setName(conf.getUserName());
            reqData.setPwd(conf.getAppCode());
@@ -240,7 +253,7 @@
            Object object = getJsonApiData(inteId, data, code);

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

@@ -337,7 +350,7 @@
            BeanUtils.copyProperties(data, api1107);
            api1107.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1107.getTykqbm())){
            if (StringUtils.isEmpty(api1107.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
                api1107.setTykqbm(tykqbm);
            }
@@ -351,7 +364,7 @@
            BeanUtils.copyProperties(data, api1108);
            api1108.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1108.getTykqbm())){
            if (StringUtils.isEmpty(api1108.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
                api1108.setTykqbm(tykqbm);
            }
@@ -366,7 +379,7 @@
            BeanUtils.copyProperties(apiData, api1109);
            api1109.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1109.getTykqbm())){
            if (StringUtils.isEmpty(api1109.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
                api1109.setTykqbm(tykqbm);
            }
@@ -388,7 +401,7 @@
            BeanUtils.copyProperties(apiData, api1110);
            api1110.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1110.getTyajbm())){
            if (StringUtils.isEmpty(api1110.getTyajbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
                api1110.setTyajbm(tyhwbm);
            }
@@ -406,7 +419,7 @@
            BeanUtils.copyProperties(data, api1111);
            api1111.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1111.getTykqbm())){
            if (StringUtils.isEmpty(api1111.getTykqbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
                api1111.setTykqbm(tyhwbm);
            }
@@ -422,12 +435,12 @@
            api1112.setBjw(ShAreaBjw.getBjw(code));
            api1112.setZy("01");
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1112.getTydwbm())){
            if (StringUtils.isEmpty(api1112.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
                api1112.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1112.getTykqbm())){
            if (StringUtils.isEmpty(api1112.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
                api1112.setTykqbm(tykqbm);
            }
@@ -441,7 +454,7 @@
            BeanUtils.copyProperties(data, api1113);
            api1113.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1113.getTydwbm())){
            if (StringUtils.isEmpty(api1113.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
                api1113.setTydwbm(tydwbm);
            }
@@ -463,7 +476,7 @@
            BeanUtils.copyProperties(data, api1201);
            api1201.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1201.getTydwbm())){
            if (StringUtils.isEmpty(api1201.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
                api1201.setTydwbm(tydwbm);
            }
@@ -478,14 +491,14 @@
            }
            //设置购销方式,默认客户统一信用码为空，则为产销，反之为竞价；(1-定向；2-竞价；3-产销)
            api1201.setGxfs("2");
            if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
            if (StringUtils.isEmpty(api1201.getKhtyshxydm())) {
                api1201.setGxfs("3");
            }
            //付款方式
            if(StringUtils.isEmpty(api1201.getFkfs())){
            if (StringUtils.isEmpty(api1201.getFkfs())) {
                api1201.setFkfs("4");
            }
            if(StringUtils.isEmpty(api1201.getYsfs())){
            if (StringUtils.isEmpty(api1201.getYsfs())) {
                api1201.setYsfs("按封仓数量进行验收");
            }
            //设置空属性为默认值
@@ -498,13 +511,13 @@
            BeanUtils.copyProperties(apiData, api1202);
            api1202.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1202.getTyhwbm())){
            if (StringUtils.isEmpty(api1202.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
                api1202.setTyhwbm(tyhwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1202.getLqgsdwtybm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0,18));
            if (StringUtils.isEmpty(api1202.getLqgsdwtybm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
                api1202.setLqgsdwtybm(tydwbm);
            }
            api1202.setJzrq(apiData.getCmsj());
@@ -517,12 +530,12 @@
            //设置粮食轮换年度,根据计划明细号查询计划明细，再根据计划明细查询轮换计划
            List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
            if (null != api1404List && api1404List.size() > 0) {
                if(StringUtils.isEmpty(api1202.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())){
                if (null != api1403List && api1403List.size() > 0) {
                    if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
                        api1202.setLhnd(api1403List.get(0).getJhnd());
                    }
                }
@@ -540,13 +553,19 @@
            //粮食性质
            api1202.setLsxzdm("200");
            //售粮人信息
            if(StringUtils.isEmpty(api1202.getSlr())){
            if (StringUtils.isEmpty(api1202.getSlr())) {
                api1202.setSlr("售粮人");
            }
            if(StringUtils.isEmpty(api1202.getSlrdz())){
            if (StringUtils.isEmpty(api1202.getSlrdz())) {
                api1202.setSlrdz("售粮人地址");
            }

            //生成方式
            if (null == api1202.getScfs()) {
                api1202.setScfs("1");
            }
            if (StringUtils.isEmpty(api1202.getSdblyy())) {
                api1202.setSdblyy("流程生成无补录原因");
            }
            //设置空属性为默认值
            changeObject(api1202);
            return api1202;
@@ -557,7 +576,7 @@
            BeanUtils.copyProperties(apiData, api1203);
            api1203.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1203.getTyhwbm())){
            if (StringUtils.isEmpty(api1203.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
                api1203.setTyhwbm(tyhwbm);
            }
@@ -582,7 +601,7 @@
            api1203.setZjbh(api1203.getRkjydh());
            List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh());
            if (null != api1202List && api1202List.size() > 0) {
                if(api1202List.get(0).getYsgj().equals("3")){
                if (api1202List.get(0).getYsgj().equals("3")) {
                    api1203.setZjbh(api1202List.get(0).getBizId().substring(2));
                }
            }
@@ -596,7 +615,7 @@
            BeanUtils.copyProperties(apiData, api1204);
            api1204.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1204.getTyhwbm())){
            if (StringUtils.isEmpty(api1204.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
                api1204.setTyhwbm(tyhwbm);
            }
@@ -628,7 +647,7 @@
            BeanUtils.copyProperties(apiData, api1205);
            api1205.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1205.getTyhwbm())){
            if (StringUtils.isEmpty(api1205.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
                api1205.setTyhwbm(tyhwbm);
            }
@@ -643,12 +662,12 @@
            //设置粮食轮换年度
            List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
            if (null != api1404List && api1404List.size() > 0) {
                if(StringUtils.isEmpty(api1205.getShnd())){
                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())){
                if (null != api1403List && api1403List.size() > 0) {
                    if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
                        api1205.setLhnd(api1403List.get(0).getJhnd());
                    }
                }
@@ -665,10 +684,10 @@
                api1205.setZjbgdh(api1310List.get(0).getZjbgdh());
            }
            //生成方式
            if(null == api1205.getScfs()){
            if (null == api1205.getScfs()) {
                api1205.setScfs("1");
            }
            if(StringUtils.isEmpty(api1205.getSdblyy())){
            if (StringUtils.isEmpty(api1205.getSdblyy())) {
                api1205.setSdblyy("流程生成无补录原因");
            }
            //设置空属性为默认值
@@ -681,7 +700,7 @@
            BeanUtils.copyProperties(apiData, api1206);
            api1206.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1206.getTykqbm())){
            if (StringUtils.isEmpty(api1206.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1206.setTykqbm(tykqbm);
            }
@@ -714,12 +733,12 @@
            api1207.setDcrq(apiData.getDcrq());
            api1207.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1207.getDcdwtybm())){
            if (StringUtils.isEmpty(api1207.getDcdwtybm())) {
                String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
                api1207.setDcdwtybm(dckqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1207.getDchwtybm())){
            if (StringUtils.isEmpty(api1207.getDchwtybm())) {
                String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
                api1207.setDchwtybm(dchwtybm);
            }
@@ -741,12 +760,12 @@

            api1208.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getZglktybm())){
            if (StringUtils.isEmpty(api1208.getZglktybm())) {
                String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
                api1208.setZglktybm(lqgstydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getTyhwbm())){
            if (StringUtils.isEmpty(api1208.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                api1208.setTyhwbm(tyhwbm);
            }
@@ -756,12 +775,15 @@
                api1208.setCd(api1208.getHwdm().substring(2, 8));
            }
            //包装储粮是，核查包存粮包数
            if(null == apiData.getBclbs()){
                apiData.setBclbs(0);
            if (null == apiData.getBclbs()) {
                api1208.setBclbs(0);
            }
            if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
                apiData.setBclbs((int)(apiData.getSjsl()/25));
            if ("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0) {
                api1208.setBclbs((int) (apiData.getSjsl() / 25));
                api1208.setCplgg(25);
                api1208.setCplbs(api1208.getBclbs());
            }

            //设置空属性为默认值
            changeObject(api1208);
            return api1208;
@@ -780,9 +802,10 @@
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
                api1209.setLspzdm(api1208List.get(0).getLspzdm());
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1209.getTyhwbm())){
            if (StringUtils.isEmpty(api1209.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
                api1209.setTyhwbm(tyhwbm);
            }
@@ -790,13 +813,13 @@
            api1209.setLsxzdm("122");

            //损益环节，默认出库损耗
            if(StringUtils.isEmpty(api1209.getSyhj())){
            if (StringUtils.isEmpty(api1209.getSyhj())) {
                api1209.setSyhj("2");
            }
            //获取上海规范损益类型
            api1209.setSylx(getShSylxByGb(api1209.getSylx()));
            //入库数量
            if(api1209.getRksl() < api1209.getRkjz()){
            if (api1209.getRksl() < api1209.getRkjz()) {
                api1209.setRksl(api1209.getRkjz());
            }
            api1209.setCqqrbs(apiData.getCqqrbs() + "");
@@ -812,7 +835,7 @@
            BeanUtils.copyProperties(apiData, api1210);
            api1210.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1210.getTyhwbm())){
            if (StringUtils.isEmpty(api1210.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
                api1210.setTyhwbm(tyhwbm);
            }
@@ -822,15 +845,15 @@
            }

            //若计划明细号为空，设置计划明细号，根据划转性质查询出入库信息获取计划号
            if(StringUtils.isEmpty(api1210.getJhmxdh())){
                if("200".equals(api1210.getHzqlsxzdm())){
            if (StringUtils.isEmpty(api1210.getJhmxdh())) {
                if ("200".equals(api1210.getHzqlsxzdm())) {
                    //若划转前性质为商品粮，则查询入库信息获取计划明细号
                    List<Api1202> api1202List = api1202Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
                    if (null != api1202List && api1202List.size() > 0) {
                        api1210.setJhmxdh(api1202List.get(0).getJhmxh());
                    }
                }
                if("200".equals(api1210.getHzhlsxzdm())){
                if ("200".equals(api1210.getHzhlsxzdm())) {
                    //若划转后性质为商品粮，则查询出库信息获取计划明细号
                    List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
                    if (null != api1205List && api1205List.size() > 0) {
@@ -851,7 +874,7 @@
            api1211.setZglkdm(api1211.getKqdm());
            api1211.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getTyhwbm())){
            if (StringUtils.isEmpty(api1211.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
                api1211.setTyhwbm(tyhwbm);
            }
@@ -863,12 +886,16 @@
            //主管粮库代码
            api1211.setZglkdm(apiData.getKqdm());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getZglktybm())){
            if (StringUtils.isEmpty(api1211.getZglktybm())) {
                String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
                api1211.setZglktybm(zglktybm);
            }
            //设置空属性为默认值
            changeObject(api1211);
            api1211.setYwksrq(api1211.getYwrq());
            if ("0".equals(api1211.getYjbz())) {
                api1211.setYwksrq(DateUtil.getMonthFirst(api1211.getYwrq()));
            }
            return api1211;
        }
        if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
@@ -876,12 +903,12 @@
            BeanUtils.copyProperties(data, api1212);
            api1212.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1212.getTydwbm())){
            if (StringUtils.isEmpty(api1212.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
                api1212.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1212.getTykqbm())){
            if (StringUtils.isEmpty(api1212.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
                api1212.setTykqbm(tykqbm);
            }
@@ -893,6 +920,9 @@
            Api1213 api1213 = (Api1213) data;
            SH2023Api1213 apiData = new SH2023Api1213();
            BeanUtils.copyProperties(api1213, apiData);
            apiData.setBjw(ShAreaBjw.getBjw(code));
            //设置批次号
            apiData.setPch(apiData.getHwdm() + apiData.getShnd());
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1213.getHwdm());
@@ -905,7 +935,7 @@
            BeanUtils.copyProperties(data, api1301);
            api1301.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1301.getTykqbm())){
            if (StringUtils.isEmpty(api1301.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
                api1301.setTykqbm(tykqbm);
            }
@@ -919,7 +949,7 @@
            BeanUtils.copyProperties(apiData, api1302);
            api1302.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1302.getTyhwbm())){
            if (StringUtils.isEmpty(api1302.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
                api1302.setTyhwbm(tyhwbm);
            }
@@ -942,7 +972,7 @@
            BeanUtils.copyProperties(apiData, api1303);
            api1303.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1303.getTyhwbm())){
            if (StringUtils.isEmpty(api1303.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
                api1303.setTyhwbm(tyhwbm);
            }
@@ -960,7 +990,7 @@
            BeanUtils.copyProperties(apiData, api1304);
            api1304.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1304.getTyhwbm())){
            if (StringUtils.isEmpty(api1304.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
                api1304.setTyhwbm(tyhwbm);
            }
@@ -980,7 +1010,7 @@
            api1305.setBjw(ShAreaBjw.getBjw(code));
            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1305.getTyajbm())){
            if (StringUtils.isEmpty(api1305.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
                api1305.setTyajbm(tyajbm);
            }
@@ -1001,7 +1031,7 @@
            api1306.setBjw(ShAreaBjw.getBjw(code));
            api1306.setAjdm(apiData.getHwdm().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1306.getTyajbm())){
            if (StringUtils.isEmpty(api1306.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
                api1306.setTyajbm(tyajbm);
            }
@@ -1026,17 +1056,17 @@
            api1307.setBjw(ShAreaBjw.getBjw(code));
            api1307.setAjdm(apiData.getHwdm().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTykqbm())){
            if (StringUtils.isEmpty(api1307.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
                api1307.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyajbm())){
            if (StringUtils.isEmpty(api1307.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
                api1307.setTyajbm(tyajbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyhwbm())){
            if (StringUtils.isEmpty(api1307.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
                api1307.setTyhwbm(tyhwbm);
            }
@@ -1051,12 +1081,12 @@
            BeanUtils.copyProperties(apiData, api1308);
            api1308.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTykqbm())){
            if (StringUtils.isEmpty(api1308.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
                api1308.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTyhwbm())){
            if (StringUtils.isEmpty(api1308.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
                api1308.setTyhwbm(tyhwbm);
            }
@@ -1069,7 +1099,7 @@
            BeanUtils.copyProperties(data, api1309);
            api1309.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1309.getTykqbm())){
            if (StringUtils.isEmpty(api1309.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
                api1309.setTykqbm(tykqbm);
            }
@@ -1084,7 +1114,7 @@
            api1310.setBjw(ShAreaBjw.getBjw(code));
            api1310.setJyrq(apiData.getJysj());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1310.getTyhwbm())){
            if (StringUtils.isEmpty(api1310.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
                api1310.setTyhwbm(tyhwbm);
            }
@@ -1131,7 +1161,7 @@
            BeanUtils.copyProperties(data, api1311);
            api1311.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1311.getTykqbm())){
            if (StringUtils.isEmpty(api1311.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
                api1311.setTykqbm(tykqbm);
            }
@@ -1144,7 +1174,7 @@
            BeanUtils.copyProperties(data, api1401);
            api1401.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1401.getTydwbm())){
            if (StringUtils.isEmpty(api1401.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
                api1401.setTydwbm(tydwbm);
            }
@@ -1171,19 +1201,19 @@
            api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
            api1403.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1403.getTydwbm())){
            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; //用于统计轮入数量和轮出数量
            if(null != list && list.size() > 0){
            if (null != list && list.size() > 0) {
                for (Api1404 api1404 : list) {
                    if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){
                    if (null != api1404.getLhlx() && "2".equals(api1404.getLhlx())) {
                        lrsl += api1404.getLhsl();
                    }
                    if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){
                    if (null != api1404.getLhlx() && "1".equals(api1404.getLhlx())) {
                        lcsl += api1404.getLhsl();
                    }
                }
@@ -1201,7 +1231,7 @@
            api1404.setMxzt("1");
            api1404.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1404.getTyhwbm())){
            if (StringUtils.isEmpty(api1404.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
                api1404.setTyhwbm(tyhwbm);
            }
@@ -1222,12 +1252,12 @@
                apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDrdwtybm())){
            if (StringUtils.isEmpty(apiData.getDrdwtybm())) {
                String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
                apiData.setDrdwtybm(drkqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDrhwtybm())){
            if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
                String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
                apiData.setDrhwtybm(drhwtybm);
            }
@@ -1240,7 +1270,7 @@
            SH2023Api2103 apiData = new SH2023Api2103();
            BeanUtils.copyProperties(data, apiData);
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
@@ -1265,39 +1295,77 @@
            return data;
        }
        if (Constant.API_CODE_1504.equals(inteId)) {
            Api1504 api1504 = (Api1504)data;
            Api1504 api1504 = (Api1504) data;
            SH2023Api1504 apiData = new SH2023Api1504();
            BeanUtils.copyProperties(api1504, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {
            Api1505 api1505 = (Api1505) data;
            SH2023Api1505 apiData = new SH2023Api1505();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1505, apiData);
            apiData.setCqunit(api1505.getCqunit() + "");
            apiData.setCyear(api1505.getCyear() + "");
            apiData.setCdc(api1505.getCdc() + "");
            apiData.setBl(api1505.getBl() + "");
            apiData.setNgrade(api1505.getNgrade() + "");
            apiData.setBq(api1505.getBq() + "");
            apiData.setCqunit(api1505.getCqunit() + "");
            apiData.setBcash(api1505.getBcash() + "");
            apiData.setBbank(api1505.getBbank() + "");
            apiData.setBxjll(api1505.getBxjll() + "");
            apiData.setBf(api1505.getBf() + "");
            return apiData;
        }
        if (Constant.API_CODE_1506.equals(inteId)) {
            Api1506 api1506 = (Api1506) data;
            SH2023Api1506 apiData = new SH2023Api1506();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1506, apiData);
            apiData.setCyear(api1506.getCyear() + "");
            apiData.setNno(api1506.getNno() + "");
            apiData.setCdc(api1506.getCdc() + "");
            return apiData;
        }
        if (Constant.API_CODE_1507.equals(inteId)) {
            Api1507 api1507 = (Api1507) data;
            SH2023Api1507 apiData = new SH2023Api1507();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1507, apiData);
            apiData.setCmon(api1507.getCmon() + "");
            apiData.setCyear(api1507.getCyear() + "");
            apiData.setNvno(api1507.getNvno() + "");
            apiData.setNno(api1507.getNno() + "");
            apiData.setCdc(api1507.getCdc() + "");
            apiData.setBpt(api1507.getBpt() + "");
            apiData.setNanum(api1507.getNanum() + "");
            apiData.setBtmp(api1507.getBtmp() + "");
            return apiData;
        }
        if (Constant.API_CODE_1508.equals(inteId)) {
            Api1508 api1508 = (Api1508) data;
            SH2023Api1508 apiData = new SH2023Api1508();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1508, apiData);
            apiData.setCmon(api1508.getCmon() + "");
            apiData.setCyear(api1508.getCyear() + "");
            apiData.setNvno(api1508.getNvno() + "");
            apiData.setNrowno(api1508.getNrowno() + "");
            apiData.setCdc(api1508.getCdc() + "");
            return apiData;
        }
        if (Constant.API_CODE_1509.equals(inteId)) {
            Api1509 api1509 = (Api1509) data;
            SH2023Api1509 apiData = new SH2023Api1509();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1509, apiData);
            apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
            apiData.setSourceid(api1509.getSourceid() + "");
            apiData.setUsingperiods(api1509.getUsingperiods() + "");
            return apiData;
        }
        if (Constant.API_CODE_1510.equals(inteId)) {
            Api1510 api1510 = (Api1510) data;
            SH2023Api1510 apiData = new SH2023Api1510();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1510, apiData);
            apiData.setPeriod(api1510.getPeriod() + "");
            apiData.setAcctyear(api1510.getAcctyear() + "");
            return apiData;
        }
        //设置空属性为默认值
@@ -1307,6 +1375,7 @@

    /**
     * 赋值最后更新时间
     *
     * @param object
     * @return
     */
@@ -1354,7 +1423,7 @@
                map.put(ceng, new ArrayList<>());
            }
            map.get(ceng).add(Double.valueOf(grain[0]));
            lwmx +=  grain[2]  + ":" + grain[3]  +":" + grain[1] + "$" + grain[0];
            lwmx += grain[2] + ":" + grain[3] + ":" + grain[1] + "$" + grain[0];
            if (Double.valueOf(grain[0]) <= -100) {
                lwmx += "$" + "1" + "#";
                errorNum++;
@@ -1384,7 +1453,7 @@
            tempL = null;
            tempA = 0.0;
            for (Double point : payPoints) {
                if(point > -100){
                if (point > -100) {
                    sum += point;
                    num++;
                    if (tempH == null) {
@@ -1466,12 +1535,12 @@
        shFinanceDto.setDwdm(api1503.getDwdm());
        shFinanceDto.setKqdm(api1503.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
        if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) {
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
        if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) {
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
@@ -1480,16 +1549,16 @@
        shFinanceDto.setCzbz(api1503.getCzbz());
        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        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, "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() + "");
@@ -1527,12 +1596,12 @@
        shFinanceDto.setDwdm(api1502.getDwdm());
        shFinanceDto.setKqdm(api1502.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
        if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) {
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
        if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) {
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
@@ -1541,16 +1610,16 @@
        shFinanceDto.setCzbz(api1502.getCzbz());
        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        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, "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() + "");
@@ -1590,12 +1659,12 @@
        shFinanceDto.setDwdm(api1501.getDwdm());
        shFinanceDto.setKqdm(api1501.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
        if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) {
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
        if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) {
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
@@ -1604,16 +1673,16 @@
        shFinanceDto.setCzbz(api1501.getCzbz());
        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        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, "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() + "");
@@ -1704,6 +1773,7 @@
        }
        return wjmc;
    }

    private String getYwdh(String wjlx, String wjmc, String ywdh) {
        String[] s = wjmc.split("_");
        if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
@@ -1741,11 +1811,11 @@
        return object;
    }

    private String getShSylxByGb(String gbSylx){
        if("1".equals(gbSylx)){
    private String getShSylxByGb(String gbSylx) {
        if ("1".equals(gbSylx)) {
            return "2";
        }
        if("2".equals(gbSylx)){
        if ("2".equals(gbSylx)) {
            return "1";
        }
        return gbSylx;