From 6ad5ee724102a7cc115a4024c00e23b40b87072c Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 20 九月 2023 17:45:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java |  472 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 386 insertions(+), 86 deletions(-)

diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index d0bdae4..cbf506f 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -5,22 +5,26 @@
 import com.fzzy.api.data.ApiParam;
 import com.fzzy.api.data.PushProtocol;
 import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
 import com.fzzy.api.service.ApiCommonService;
 import com.fzzy.api.service.ApiRemoteService;
 import com.fzzy.api.utils.*;
 import com.fzzy.api.view.repository.ApiLogRep;
 import com.fzzy.push.gd2022.dto.*;
+import com.fzzy.push.gd2022.dto.Gd2022Api1101;
+import com.fzzy.push.gd2022.dto.Gd2022Api1109;
+import com.fzzy.push.gd2022.dto.Gd2022Api1208;
+import com.fzzy.push.gd2022.dto.Gd2022Api1307;
+import com.fzzy.push.gd2022.dto.Gd2022Api1308;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 
 /**
  * @author vince.xu
@@ -51,6 +55,12 @@
 
     @Override
     public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
+        if (Constant.API_CODE_1501.equals(param.getInteId())
+                || Constant.API_CODE_1502.equals(param.getInteId())
+                || Constant.API_CODE_1503.equals(param.getInteId())) {
+            return pushFinanceData(param, conf, data);
+        }
+
         String inteId = param.getInteId();
         String kqdm = param.getKqdm();
         String bizId = param.getBizId();
@@ -68,8 +78,9 @@
             apiLog.setId(ContextUtil.getUUID());
             apiLog.setInteId(inteId);
             String jsonData = getJsonData(inteId, data, conf.getApiUrl(), token);
+            log.info("鎶ユ枃淇℃伅=" + jsonData);
             inteId = getInteId(inteId);
-            if(StringUtils.isEmpty(inteId)){
+            if (StringUtils.isEmpty(inteId)) {
                 ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
                 apiLog.setStatus(99);
                 apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
@@ -96,12 +107,12 @@
             }
 
             Map<String, Object> map = new HashMap<>();
-            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId,jsonData,conf, token);
+            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf, token);
             responseDto.setBizId(bizId);
             apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
             apiLog.setResult(responseDto.getMsg());
             apiLogRep.save(apiLog);
-            ResponseDto resd= new ResponseDto();
+            ResponseDto resd = new ResponseDto();
             resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
             resd.setMsg(responseDto.getMsg());
             //updateGD2022AuthToken(responseDto,conf, token);
@@ -117,80 +128,153 @@
         return pushData(param, null, data);
     }
 
-
-//    /**
-//     * @Desc: 鍥芥爣鑷畾涔夋柟娉�
-//     * @author: Andy
-//     * @update-time: 2022/10/10
-//     */
-//    public GD2022ResponseDto pushData(String inteId, String kqdm, String bizId, Object data) {
-//        ApiConfs conf = apiCommonService.getConf(kqdm);
+//    @Override
+//    public ResponseDto pushFile(ApiParam param, ApiConfs conf, Object data) {
 //
-//        ApiParam param = new ApiParam(conf);
+//        String inteId = param.getInteId();
+//        String kqdm = param.getKqdm();
 //
-//        param.setInteId(inteId);
-//        param.setInteCategory(inteId.substring(0, 2));
-//        param.setBizId(bizId);
-//
-//        return pushData(param, conf, data);
-//    }
-
-
-//    /**
-//     * 鍗曟潯涓婁紶鏁版嵁
-//     *
-//     * @param inteId
-//     * @param data
-//     * @return
-//     */
-//    public ResponseDto pushData(String inteId, ApiParent data) {
 //        try {
-//            //鑾峰彇閰嶇疆
-//            ApiConfs conf = apiCommonService.getConf(data.getKqdm());
+//
+//            if (null == conf) {
+//                conf = apiCommonService.getConf(kqdm);
+//            }
 //            //鑾峰彇TOKEN
 //            GD2022AuthToken token = getGD2022AuthToken(conf);
 //
-//            //娣诲姞LOGO
 //            ApiLog apiLog = new ApiLog();
 //            apiLog.setId(ContextUtil.getUUID());
-//            if (!Constant.API_CODE_1109.equals(inteId)) {
-//                apiLog.setData(JSON.toJSONString(data));
-//            }
 //            apiLog.setInteId(inteId);
-//            apiLog.setKqdm(data.getKqdm());
+//            apiLog.setData(JSON.toJSONString(data));
+//            apiLog.setKqdm(kqdm);
 //            apiLog.setUploadTime(new Date());
 //
-//            if (conf == null) {
-//                GD2022ResponseDto responseDto = new GD2022ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", data.getBizId());
+//            String wjdz = "";
+//            if (Constant.API_CODE_1109.equals(inteId)) {
+//                //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+//                Gd2022Api1109 api1109 = new Gd2022Api1109();
+//                BeanUtils.copyProperties(data, api1109);
+//                wjdz = api1109.getWjdz();
+//            } else if (Constant.API_CODE_1307.equals(inteId)) {
+//                //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+//                Gd2022Api1307 api1307 = new Gd2022Api1307();
+//                BeanUtils.copyProperties(data, api1307);
+//                wjdz = api1307.getWjdz();
+//            } else if (Constant.API_CODE_1308.equals(inteId)) {
+//                //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+//                Gd2022Api1308 api1308 = new Gd2022Api1308();
+//                BeanUtils.copyProperties(data, api1308);
+//                wjdz = api1308.getWjdz();
+//            }
+//            if (StringUtils.isEmpty(wjdz)) {
+//                ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版枃浠跺湴鍧�", wjdz);
 //                apiLog.setStatus(99);
-//                apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+//                apiLog.setResult("娌℃湁鑾峰彇鍒版枃浠跺湴鍧�");
 //                apiLogRep.save(apiLog);
 //                return responseDto;
 //            }
-//            if (null == token) {
-//                GD2022ResponseDto responseDto = new GD2022ResponseDto(99, "娌℃湁鑾峰彇鍒癟OKEN淇℃伅", data.getBizId());
-//                apiLog.setStatus(99);
-//                apiLog.setResult("娌℃湁鑾峰彇鍒癟OKEN淇℃伅");
-//                apiLogRep.save(apiLog);
-//                return responseDto;
-//            }
-//
-//            Map<String, Object> map = new HashMap<>();
-//            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId,JSON.toJSONString(data),conf, token);
-//            responseDto.setBizId(data.getBizId());
-//            apiLog.setStatus(responseDto.getSuccess());
-//            apiLog.setResult(responseDto.getMsg());
-//
-//            apiLogRep.save(apiLog);
-//
-//            updateGD2022AuthToken(responseDto, token);
-//
-//            return responseDto;
+//            //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+//            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(conf.getApiUrl(), token, wjdz);
+//            ResponseDto resd = new ResponseDto();
+//            resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+//            resd.setBizId((String) responseDto.getData());
+//            resd.setMsg(responseDto.getMsg());
+//            return resd;
 //        } catch (Exception e) {
 //            log.error(e.getMessage(), e);
 //            return new ResponseDto(99, e.getMessage());
 //        }
 //    }
+
+    /**
+     * 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
+     * @param param
+     * @param conf
+     * @param data
+     * @return
+     */
+    private ResponseDto pushFinanceData(ApiParam param, ApiConfs conf, Object data) {
+
+        String inteId = param.getInteId();
+        String kqdm = param.getKqdm();
+        String bizId = param.getBizId();
+
+        try {
+
+            if (null == conf) {
+                conf = apiCommonService.getConf(kqdm);
+            }
+            //鑾峰彇TOKEN
+            GD2022AuthToken token = getGD2022AuthToken(conf);
+
+            //娣诲姞LOGO
+            ApiLog apiLog = new ApiLog();
+            apiLog.setId(ContextUtil.getUUID());
+            apiLog.setInteId(inteId);
+
+
+            inteId = getInteId(inteId);
+            if (StringUtils.isEmpty(inteId)) {
+                ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
+                apiLog.setStatus(99);
+                apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
+                apiLogRep.save(apiLog);
+                return responseDto;
+            }
+
+            apiLog.setKqdm(kqdm);
+            apiLog.setUploadTime(new Date());
+
+            if (conf == null) {
+                ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", bizId);
+                apiLog.setStatus(99);
+                apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+                apiLogRep.save(apiLog);
+                return responseDto;
+            }
+            if (null == token) {
+                ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒癟OKEN淇℃伅", bizId);
+                apiLog.setStatus(99);
+                apiLog.setResult("娌℃湁鑾峰彇鍒癟OKEN淇℃伅");
+                apiLogRep.save(apiLog);
+                return responseDto;
+            }
+
+            List<GDFinanceDto> list = null;
+            if (Constant.API_CODE_1501.equals(param.getInteId())) {
+                list = copyApi1501((Api1501) data);
+            } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
+                list = copyApi1502((Api1502) data);
+            } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
+                list = copyApi1503((Api1503) data);
+            }
+            GD2022ResponseDto responseDto;
+            ResponseDto resd = null;
+            String jsonData;
+            for (GDFinanceDto gdFinanceDto : list) {
+                resd = new ResponseDto();
+                jsonData = getJsonData(param.getInteId(), gdFinanceDto, conf.getApiUrl(), token);
+                log.info("鎶ユ枃淇℃伅=" + jsonData);
+                responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf, token);
+                responseDto.setBizId(bizId);
+
+                apiLog.setData(jsonData);
+                apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+                apiLog.setResult(responseDto.getMsg());
+
+                resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+                resd.setMsg(responseDto.getMsg());
+                if (resd.success > 0) {
+                    break;
+                }
+            }
+            apiLogRep.save(apiLog);
+            return resd;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return new ResponseDto(99, e.getMessage());
+        }
+    }
 
     /**
      * 浠g爜璋冩暣
@@ -209,11 +293,11 @@
             Map<String, Object> map = new HashMap<>();
             map.put("appid", conf.getUserName());
 //            map.put("appkey", EncryptUtil.encryptHex(conf.getPassword(),conf.getPublicKey()));
-            map.put("appkey", AESUtils.encrypt(conf.getPassword(),conf.getPublicKey()));
-            GD2022ResponseDto<GD2022AuthToken> responseDto = GD2022HttpClientUtil.postGetToken(conf.getApiUrl() + "sfrz",map);
+            map.put("appkey", AESUtils.encrypt(conf.getPassword(), conf.getPublicKey()));
+            GD2022ResponseDto<GD2022AuthToken> responseDto = GD2022HttpClientUtil.postGetToken(conf.getApiUrl() + "sfrz", map);
             token = new GD2022AuthToken();
 
-            updateGD2022AuthToken(responseDto, conf,token);
+            updateGD2022AuthToken(responseDto, conf, token);
 
             return token;
         } catch (Exception e) {
@@ -226,13 +310,13 @@
         String key = RedisConst.buildKey(RedisConst.KYE_TOKEN, conf.getKqdm());
 
         if (null == dto) {
-           // redisUtil.set(key, token, 170);
+            // redisUtil.set(key, token, 170);
             return;
         }
 
         if (dto.getCode() != 200) {
             return;
-        }  else {
+        } else {
             GD2022AuthToken token1 = dto.getData();
             token.setAccess_token(token1.getAccess_token());
             token.setAppid(token1.getAppid());
@@ -240,32 +324,37 @@
         }
     }
 
-    private String getJsonData(String inteId , Object data, String url, GD2022AuthToken authToken) throws Exception {
-        if(Constant.API_CODE_1101.equals(inteId)){
-            Api1101 api1101  = new Api1101();
-            BeanUtils.copyProperties(data,api1101);
+    private String getJsonData(String inteId, Object data, String url, GD2022AuthToken authToken) throws Exception {
+        if (Constant.API_CODE_1101.equals(inteId)) {
+            Gd2022Api1101 api1101 = new Gd2022Api1101();
+            BeanUtils.copyProperties(data, api1101);
             return JSON.toJSONString(api1101);
-        }else if(Constant.API_CODE_1109.equals(inteId)){
+        } else if (Constant.API_CODE_1109.equals(inteId)) {
             //灏佽鏁版嵁
-            Api1109 api1109 = new Api1109();
-            BeanUtils.copyProperties(data,api1109);
+            Gd2022Api1109 api1109 = new Gd2022Api1109();
+            BeanUtils.copyProperties(data, api1109);
 
             if (null == authToken) {
                 return JSON.toJSONString(api1109);
             }
             //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
             GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
+            System.out.println((String) responseDto.getData());
             //璁剧疆涓婁紶鏂囦欢id
             api1109.setFileStorageId((String) responseDto.getData());
             return JSON.toJSONString(api1109);
-        }else if(Constant.API_CODE_1208.equals(inteId)){
-            Api1208 api1208  = new Api1208();
-            BeanUtils.copyProperties(data,api1208);
+        }else if (Constant.API_CODE_1111.equals(inteId)) {
+            Gd2022Api1111 api1111 = new Gd2022Api1111();
+            BeanUtils.copyProperties(data, api1111);
+            return JSON.toJSONString(api1111);
+        } else if (Constant.API_CODE_1208.equals(inteId)) {
+            Gd2022Api1208 api1208 = new Gd2022Api1208();
+            BeanUtils.copyProperties(data, api1208);
             return JSON.toJSONString(api1208);
-        }else if(Constant.API_CODE_1307.equals(inteId)){
+        } else if (Constant.API_CODE_1307.equals(inteId)) {
             //灏佽鏁版嵁
-            Api1307 api1307  = new Api1307();
-            BeanUtils.copyProperties(data,api1307);
+            Gd2022Api1307 api1307 = new Gd2022Api1307();
+            BeanUtils.copyProperties(data, api1307);
 
             if (null == authToken) {
                 return JSON.toJSONString(api1307);
@@ -275,10 +364,10 @@
             //璁剧疆涓婁紶鏂囦欢id
             api1307.setFileStorageId((String) responseDto.getData());
             return JSON.toJSONString(api1307);
-        }else if(Constant.API_CODE_1308.equals(inteId)){
+        } else if (Constant.API_CODE_1308.equals(inteId)) {
             //灏佽鏁版嵁
-            Api1308 api1308  = new Api1308();
-            BeanUtils.copyProperties(data,api1308);
+            Gd2022Api1308 api1308 = new Gd2022Api1308();
+            BeanUtils.copyProperties(data, api1308);
 
             if (null == authToken) {
                 return JSON.toJSONString(api1308);
@@ -288,14 +377,225 @@
             //璁剧疆涓婁紶鏂囦欢id
             api1308.setFileStorageId((String) responseDto.getData());
             return JSON.toJSONString(api1308);
-        }else{
+        } else {
             return JSON.toJSONString(data);
         }
     }
 
 
-    private String getInteId(String inteId){
-        switch (inteId){
+    private List<GDFinanceDto> copyApi1503(Api1503 data) {
+        Api1503 api1503 = data;
+        List<GDFinanceDto> list = new ArrayList<>();
+        GDFinanceDto gdFinanceDto = new GDFinanceDto();
+        gdFinanceDto.setDwdm(api1503.getDwdm());
+        gdFinanceDto.setKqdm(api1503.getKqdm());
+        gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
+        gdFinanceDto.setBbm("03");
+        gdFinanceDto.setCzbz(api1503.getCzbz());
+        gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+
+        paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+        paddingData(gdFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+        paddingData(gdFinanceDto, list, 3, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+        paddingData(gdFinanceDto, list, 4, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+        paddingData(gdFinanceDto, list, 5, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+        paddingData(gdFinanceDto, list, 6, "绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+        paddingData(gdFinanceDto, list, 7, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+        paddingData(gdFinanceDto, list, 8, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+        paddingData(gdFinanceDto, list, 9, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+        paddingData(gdFinanceDto, list, 10, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+        paddingData(gdFinanceDto, list, 11, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+        paddingData(gdFinanceDto, list, 12, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+        paddingData(gdFinanceDto, list, 13, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+        paddingData(gdFinanceDto, list, 14, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+        paddingData(gdFinanceDto, list, 15, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+        paddingData(gdFinanceDto, list, 16, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+        paddingData(gdFinanceDto, list, 17, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+        paddingData(gdFinanceDto, list, 18, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+        paddingData(gdFinanceDto, list, 19, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+        paddingData(gdFinanceDto, list, 20, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+        paddingData(gdFinanceDto, list, 21, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+        paddingData(gdFinanceDto, list, 22, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+        paddingData(gdFinanceDto, list, 23, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+        paddingData(gdFinanceDto, list, 24, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+        paddingData(gdFinanceDto, list, 25, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+        paddingData(gdFinanceDto, list, 26, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+        paddingData(gdFinanceDto, list, 27, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+        paddingData(gdFinanceDto, list, 28, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+        paddingData(gdFinanceDto, list, 29, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+        paddingData(gdFinanceDto, list, 30, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+        paddingData(gdFinanceDto, list, 31, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+        paddingData(gdFinanceDto, list, 32, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+        paddingData(gdFinanceDto, list, 33, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+        paddingData(gdFinanceDto, list, 34, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+        paddingData(gdFinanceDto, list, 35, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+        paddingData(gdFinanceDto, list, 36, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+        paddingData(gdFinanceDto, list, 37, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
+
+        return list;
+    }
+
+    private List<GDFinanceDto> copyApi1502(Api1502 data) {
+        Api1502 api1502 = data;
+        List<GDFinanceDto> list = new ArrayList<>();
+        GDFinanceDto gdFinanceDto = new GDFinanceDto();
+        gdFinanceDto.setDwdm(api1502.getDwdm());
+        gdFinanceDto.setKqdm(api1502.getKqdm());
+        gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
+        gdFinanceDto.setBbm("02");
+        gdFinanceDto.setCzbz(api1502.getCzbz());
+        gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+
+        paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+        paddingData(gdFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+        paddingData(gdFinanceDto, list, 3, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 4, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+        paddingData(gdFinanceDto, list, 5, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 6, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+        paddingData(gdFinanceDto, list, 7, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+        paddingData(gdFinanceDto, list, 8, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 9, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+        paddingData(gdFinanceDto, list, 10, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 11, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+        paddingData(gdFinanceDto, list, 12, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+        paddingData(gdFinanceDto, list, 13, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+        paddingData(gdFinanceDto, list, 14, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 15, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 16, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+        paddingData(gdFinanceDto, list, 17, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+        paddingData(gdFinanceDto, list, 18, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 19, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+        paddingData(gdFinanceDto, list, 20, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 21, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 22, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+        paddingData(gdFinanceDto, list, 23, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 24, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+        paddingData(gdFinanceDto, list, 25, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+        paddingData(gdFinanceDto, list, 26, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+        paddingData(gdFinanceDto, list, 27, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 28, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 29, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 30, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+        paddingData(gdFinanceDto, list, 31, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 32, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 33, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+        paddingData(gdFinanceDto, list, 34, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+        paddingData(gdFinanceDto, list, 35, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+        paddingData(gdFinanceDto, list, 36, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+        paddingData(gdFinanceDto, list, 37, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+        paddingData(gdFinanceDto, list, 38, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+        paddingData(gdFinanceDto, list, 39, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
+
+        return list;
+    }
+
+    private List<GDFinanceDto> copyApi1501(Api1501 api1501) {
+        List<GDFinanceDto> list = new ArrayList<>();
+        GDFinanceDto gdFinanceDto = new GDFinanceDto();
+        gdFinanceDto.setDwdm(api1501.getDwdm());
+        gdFinanceDto.setKqdm(api1501.getKqdm());
+        gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
+        gdFinanceDto.setBbm("01");
+        gdFinanceDto.setCzbz(api1501.getCzbz());
+        gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+
+        paddingData(gdFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+        paddingData(gdFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+        paddingData(gdFinanceDto, list, 3, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+        paddingData(gdFinanceDto, list, 4, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+        paddingData(gdFinanceDto, list, 5, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+        paddingData(gdFinanceDto, list, 6, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+        paddingData(gdFinanceDto, list, 7, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+        paddingData(gdFinanceDto, list, 8, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+        paddingData(gdFinanceDto, list, 9, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+        paddingData(gdFinanceDto, list, 10, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+        paddingData(gdFinanceDto, list, 11, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+        paddingData(gdFinanceDto, list, 12, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+        paddingData(gdFinanceDto, list, 13, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+        paddingData(gdFinanceDto, list, 14, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+        paddingData(gdFinanceDto, list, 15, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+        paddingData(gdFinanceDto, list, 16, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+        paddingData(gdFinanceDto, list, 17, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+        paddingData(gdFinanceDto, list, 18, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+        paddingData(gdFinanceDto, list, 19, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+        paddingData(gdFinanceDto, list, 20, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+        paddingData(gdFinanceDto, list, 21, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+        paddingData(gdFinanceDto, list, 22, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+        paddingData(gdFinanceDto, list, 23, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+        paddingData(gdFinanceDto, list, 24, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+        paddingData(gdFinanceDto, list, 25, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+        paddingData(gdFinanceDto, list, 26, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+        paddingData(gdFinanceDto, list, 27, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+        paddingData(gdFinanceDto, list, 28, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+        paddingData(gdFinanceDto, list, 29, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+        paddingData(gdFinanceDto, list, 30, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+        paddingData(gdFinanceDto, list, 31, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+        paddingData(gdFinanceDto, list, 32, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+        paddingData(gdFinanceDto, list, 33, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+        paddingData(gdFinanceDto, list, 34, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+        paddingData(gdFinanceDto, list, 35, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+        paddingData(gdFinanceDto, list, 36, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+        paddingData(gdFinanceDto, list, 37, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+        paddingData(gdFinanceDto, list, 38, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+        paddingData(gdFinanceDto, list, 39, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+        paddingData(gdFinanceDto, list, 40, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+        paddingData(gdFinanceDto, list, 41, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+        paddingData(gdFinanceDto, list, 42, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+        paddingData(gdFinanceDto, list, 43, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+        paddingData(gdFinanceDto, list, 44, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+        paddingData(gdFinanceDto, list, 45, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+        paddingData(gdFinanceDto, list, 46, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+        paddingData(gdFinanceDto, list, 47, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+        paddingData(gdFinanceDto, list, 48, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+        paddingData(gdFinanceDto, list, 49, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+        paddingData(gdFinanceDto, list, 50, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+        paddingData(gdFinanceDto, list, 51, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+        paddingData(gdFinanceDto, list, 52, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+        paddingData(gdFinanceDto, list, 53, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+        paddingData(gdFinanceDto, list, 54, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+        paddingData(gdFinanceDto, list, 55, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+        paddingData(gdFinanceDto, list, 56, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+        paddingData(gdFinanceDto, list, 57, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+        paddingData(gdFinanceDto, list, 58, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+        paddingData(gdFinanceDto, list, 59, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+        paddingData(gdFinanceDto, list, 60, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+        paddingData(gdFinanceDto, list, 61, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+        paddingData(gdFinanceDto, list, 62, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+        paddingData(gdFinanceDto, list, 63, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+        paddingData(gdFinanceDto, list, 64, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+        paddingData(gdFinanceDto, list, 65, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+        paddingData(gdFinanceDto, list, 66, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+        paddingData(gdFinanceDto, list, 67, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+        paddingData(gdFinanceDto, list, 68, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+        paddingData(gdFinanceDto, list, 69, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+        paddingData(gdFinanceDto, list, 70, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+        paddingData(gdFinanceDto, list, 71, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+        paddingData(gdFinanceDto, list, 72, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+        paddingData(gdFinanceDto, list, 73, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+        paddingData(gdFinanceDto, list, 74, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+        paddingData(gdFinanceDto, list, 75, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+        paddingData(gdFinanceDto, list, 76, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
+        return list;
+    }
+
+    private void paddingData(GDFinanceDto common,
+                             List<GDFinanceDto> list,
+                             Integer zbxh,
+                             String zbmc,
+                             String zbz1,
+                             String zbz2) {
+        GDFinanceDto gdFinanceDto = new GDFinanceDto();
+        BeanUtils.copyProperties(common, gdFinanceDto);
+        gdFinanceDto.setZbxh(zbxh);
+        gdFinanceDto.setZbmc(zbmc);
+        gdFinanceDto.setZbz1(zbz1);
+        gdFinanceDto.setZbz2(zbz2);
+        list.add(gdFinanceDto);
+    }
+
+
+    private String getInteId(String inteId) {
+        switch (inteId) {
             case "1101":
                 return ApiCodeConstant.API_CODE_DWXX;
             case "1102":

--
Gitblit v1.9.3