From c5d51d30305bd402673745cea1abce9fd1c4b443 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 11 十一月 2024 11:52:57 +0800
Subject: [PATCH] 上海接口升级调整V3.0

---
 src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java |  933 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 522 insertions(+), 411 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 0e9fe07..7c2bbd2 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -11,6 +11,7 @@
 import com.fzzy.api.service.ApiRemoteService;
 import com.fzzy.api.service.ApiTriggerService;
 import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1404Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
 
 import com.fzzy.push.sx2024.data.*;
@@ -44,6 +45,8 @@
     private ApiTriggerService apiTriggerService;
     @Autowired
     private ApiLogRep apiLogRep;
+    @Autowired
+    private Api1404Rep api1404Rep;
 
     @Override
     public String getProtocol() {
@@ -107,7 +110,7 @@
             //鎶ユ枃鏍囪瘑
             reqData.setID(orderId);
             //鐗堟湰鍙�
-            reqData.setVER("1.0");
+            reqData.setVER("2024");
             //鍗曚綅缂栫爜锛�11浣�
             reqData.setOrgNo(conf.getUserName());
             //鍗曚綅鍚嶇О
@@ -185,22 +188,16 @@
         List<Map<String, Object>> result = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();
         String inteIdUrl = getInteId(inteId);
-        //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
-        if (Constant.API_CODE_1114_1501.equals(inteId)
-                || Constant.API_CODE_1114_1502.equals(inteId)
-                || Constant.API_CODE_1114_1503.equals(inteId)) {
-            List<SXFinanceDto> list = getFinanceData(inteId, data);
-            map.put(inteIdUrl, list);
-        } else {
-            List<Object> list = new ArrayList<>();
-            Object object = getApiData(inteId, data, conf);
-            //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
-            if (!Constant.API_CODE_1208.equals(inteId)) {
-                setZhgxsjValue(data);
-            }
-            list.add(object);
-            map.put(inteIdUrl, list);
+
+        List<Object> list = new ArrayList<>();
+        Object object = getApiData(inteId, data, conf);
+        //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+        if (!Constant.API_CODE_1208.equals(inteId)) {
+            setZhgxsjValue(data);
         }
+        list.add(object);
+        map.put(inteIdUrl, list);
+
         result.add(map);
         return JSON.toJSONString(result);
     }
@@ -216,323 +213,676 @@
         if (Constant.API_CODE_1101.equals(inteId)) {
             SX2024Api1101 apiData = new SX2024Api1101();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //缁熶竴鍗曚綅鍚嶇О璧嬪��
+            apiData.setTydwmc(apiData.getDwmc());
             return apiData;
         }
         if (Constant.API_CODE_1102.equals(inteId)) {
             SX2024Api1102 apiData = new SX2024Api1102();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //缁熶竴搴撳尯鍚嶇О璧嬪��
+            apiData.setTykqmc(apiData.getKqmc());
             return apiData;
         }
         if (Constant.API_CODE_1103.equals(inteId)) {
             SX2024Api1103 apiData = new SX2024Api1103();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
-            apiData.setTycfbm(tycfbm);
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //璁剧疆绲变竴浠撴埧鍚嶇О
+            apiData.setTycfmc(apiData.getCfmc());
             return apiData;
         }
         if (Constant.API_CODE_1104.equals(inteId)) {
             SX2024Api1104 apiData = new SX2024Api1104();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tyajbm = apiCommonService.getTyajbm(apiData.getAjdh());
-            apiData.setTyajbm(tyajbm);
-            String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
-            apiData.setTycfbm(tycfbm);
+            //璁剧疆绲变竴浠撴埧缂栫爜
+            if (StringUtils.isEmpty(apiData.getTycfbm())) {
+                String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
+                apiData.setTycfbm(tycfbm);
+            }
+            //璁剧疆绲变竴寤掗棿鍚嶇О
+            apiData.setTyajmc(apiData.getAjmc());
             return apiData;
         }
         if (Constant.API_CODE_1105.equals(inteId)) {
             SX2024Api1105 apiData = new SX2024Api1105();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
-            apiData.setTyajbm(tyajbm);
-            //璁剧疆绲变竴缂栫爜
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyajbm(tyhwbm);
+            //璁剧疆绲变竴寤掗棿缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyajbm())) {
+                String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+                apiData.setTyajbm(tyajbm);
+            }
+            //璁剧疆绲变竴璐т綅鍚嶇О
+            apiData.setTyhwmc(apiData.getHwmc());
             return apiData;
         }
         if (Constant.API_CODE_1106.equals(inteId)) {
             SX2024Api1106 apiData = new SX2024Api1106();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tyygbm = apiCommonService.getTyygbm(apiData.getYgdm());
-            apiData.setTyygbm(tyygbm);
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //璁剧疆绲变竴娌圭綈鍚嶇О
+            apiData.setTyygmc(apiData.getYgmc());
             return apiData;
         }
         if (Constant.API_CODE_1107.equals(inteId)) {
             SX2024Api1107 apiData = new SX2024Api1107();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //璁剧疆绲变竴搴撳尯鍚嶇О
+            apiData.setTykqmc(apiData.getKqmc());
             return apiData;
         }
         if (Constant.API_CODE_1108.equals(inteId)) {
             SX2024Api1108 apiData = new SX2024Api1108();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //璁剧疆绲变竴搴撳尯鍚嶇О
+            apiData.setTykqmc(apiData.getKqmc());
+            //璁剧疆鑽墏缂栫爜锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+            if (apiData.getYjbh().startsWith(apiData.getKqdm())) {
+                apiData.setYjbh(apiData.getYjbh().replace(apiData.getKqdm(), apiData.getTykqbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1109.equals(inteId)) {
             Api1109 api1109 = (Api1109) data;
             SX2024Api1109 apiData = new SX2024Api1109();
             BeanUtils.copyProperties(api1109, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
             //璁剧疆鏂囦欢娴�
             apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
-            //TODO WJLJ鏂囦欢璺緞
+            //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜_
+            if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
+                apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1110.equals(inteId)) {
             SX2024Api1110 apiData = new SX2024Api1110();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1111.equals(inteId)) {
             SX2024Api1111 apiData = new SX2024Api1111();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1112.equals(inteId)) {
             SX2024Api1112 apiData = new SX2024Api1112();
             BeanUtils.copyProperties(data, apiData);
-            //璁剧疆绲变竴缂栫爜
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //缁熶竴鍗曚綅鍚嶇О璧嬪��
+            apiData.setTydwmc(apiData.getDwmc());
             return apiData;
         }
         if (Constant.API_CODE_1201.equals(inteId)) {
+            Api1201 api1201 = (Api1201) data;
             SX2024Api1201 apiData = new SX2024Api1201();
-            BeanUtils.copyProperties(data, apiData);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            BeanUtils.copyProperties(api1201, apiData);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            if (StringUtils.isEmpty(apiData.getHtzl())) {
+                apiData.setHtzl(api1201.getYwlx());
+            }
+            //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+            if (apiData.getHth().startsWith(apiData.getDwdm())) {
+                apiData.setHth(apiData.getHth().replace(apiData.getDwdm(), apiData.getTydwbm()));
+            }
+            if (StringUtils.isEmpty(apiData.getYsfs())) {
+                apiData.setYsfs("鏍规嵁鍒拌揣鏁伴噺杩涜楠屾敹");
+            }
+            if (StringUtils.isEmpty(apiData.getFKFS())) {
+                apiData.setFKFS("4");
+            }
             return apiData;
         }
         if (Constant.API_CODE_1202.equals(inteId)) {
+            Api1202 api1202 = (Api1202) data;
             SX2024Api1202 apiData = new SX2024Api1202();
-            BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm().substring(0,18));
-            apiData.setLqgsdwtybm(tydwbm);
+            BeanUtils.copyProperties(api1202, apiData);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
+                String tydwbm = apiCommonService.getTydwbm(api1202.getKqdm().substring(0, 18));
+                apiData.setLqgsdwtybm(tydwbm);
+            }
+            //鍒ゆ柇璁″垝鏄庣粏鍙凤紝涓嶄负绌�
+            if (StringUtils.isNotEmpty(apiData.getJhmxh())) {
+                Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(apiData.getJhmxh());
+                //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+                if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
+                    apiData.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + apiData.getTyhwbm().substring(0, 22)));
+                }
+            }
+            //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+            if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
+                apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+            }
+            //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+            if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
+                apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1203.equals(inteId)) {
             SX2024Api1203 apiData = new SX2024Api1203();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1204.equals(inteId)) {
+            Api1204 api1204 = (Api1204) data;
             SX2024Api1204 apiData = new SX2024Api1204();
-            BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            BeanUtils.copyProperties(api1204, apiData);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+            if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
+                apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+            }
+            //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+            if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
+                apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1205.equals(inteId)) {
             SX2024Api1205 apiData = new SX2024Api1205();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //鍒ゆ柇璁″垝鏄庣粏鍙凤紝涓嶄负绌�
+            if (StringUtils.isNotEmpty(apiData.getJhmxh())) {
+                Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(apiData.getJhmxh());
+                //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+                if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
+                    apiData.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + apiData.getTyhwbm().substring(0, 22)));
+                }
+            }
+            //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+            if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
+                apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+            }
+            //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+            if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
+                apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1206.equals(inteId)) {
+            Api1206 api1206 = (Api1206) data;
             SX2024Api1206 apiData = new SX2024Api1206();
-            BeanUtils.copyProperties(data, apiData);
+            BeanUtils.copyProperties(api1206, apiData);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(api1206.getKqdm().substring(0, 18));
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+            if (apiData.getCkjsdh().startsWith(api1206.getKqdm())) {
+                String tykqbm = apiCommonService.getTykqbm(api1206.getKqdm());
+                apiData.setCkjsdh(apiData.getCkjsdh().replace(api1206.getKqdm(), tykqbm));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1207.equals(inteId)) {
+            Api1207 api1207 = (Api1207) data;
             SX2024Api1207 apiData = new SX2024Api1207();
-            BeanUtils.copyProperties(data, apiData);
-            String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0,21));
-            apiData.setDckqtybm(dckqtybm);
-            String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0,21));
-            apiData.setDrkqtybm(drkqtybm);
-            String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
-            apiData.setDchwtybm(dchwtybm);
-            String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
-            apiData.setDrhwtybm(drhwtybm);
+            BeanUtils.copyProperties(api1207, apiData);
+            //璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+                String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
+                apiData.setDckqtybm(dckqtybm);
+            }
+            //璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+                String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+                apiData.setDrkqtybm(drkqtybm);
+            }
+            //璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+                String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
+                apiData.setDchwtybm(dchwtybm);
+            }
+            //璁剧疆鍊掑叆璐т綅缁熶竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+                String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+                apiData.setDrhwtybm(drhwtybm);
+            }
+            //璁剧疆鍊掍粨鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+            if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
+                String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
+                apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1208.equals(inteId)) {
             SX2024Api1208 apiData = new SX2024Api1208();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
-            String lqgstydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
-            apiData.setLqgstydwbm(lqgstydwbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
+                apiData.setLqgstydwbm(tydwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1209.equals(inteId)) {
+            Api1209 api1209 = (Api1209) data;
             SX2024Api1209 apiData = new SX2024Api1209();
-            BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            BeanUtils.copyProperties(api1209, apiData);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆鎹熺泭鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+            if (apiData.getSydh().startsWith(apiData.getHwdm())) {
+                apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+            }
+            //瀹為檯鎹熻�楁暟閲忚祴鍊�
+            apiData.setSjsysl(api1209.getJzsysl());
             return apiData;
         }
         if (Constant.API_CODE_1210.equals(inteId)) {
             SX2024Api1210 apiData = new SX2024Api1210();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆鎬ц川鍙樻洿鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+            if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
+                apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1211.equals(inteId)) {
             SX2024Api1211 apiData = new SX2024Api1211();
             BeanUtils.copyProperties(data, apiData);
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1212.equals(inteId)) {
             SX2024Api1212 apiData = new SX2024Api1212();
             BeanUtils.copyProperties(data, apiData);
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            return apiData;
+        }
+        if (Constant.API_CODE_1213.equals(inteId)) {
+            SX2024Api1213 apiData = new SX2024Api1213();
+            BeanUtils.copyProperties(data, apiData);
+            apiData.setCfdm(apiData.getHwdm().substring(0, 25));
+            apiData.setAjdm(apiData.getHwdm().substring(0, 28));
+            //璁剧疆绲变竴浠撴埧缂栫爜
+            if (StringUtils.isEmpty(apiData.getTycfbm())) {
+                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+                apiData.setTycfbm(tycfbm);
+            }
+            //璁剧疆绲变竴寤掗棿缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyajbm())) {
+                String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+                apiData.setTyajbm(tyajbm);
+            }
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1301.equals(inteId)) {
             SX2024Api1301 apiData = new SX2024Api1301();
             BeanUtils.copyProperties(data, apiData);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
-            apiData.setTydwbm(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTydwbm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+                apiData.setTydwbm(tydwbm);
+            }
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1302.equals(inteId)) {
             SX2024Api1302 apiData = new SX2024Api1302();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+            if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
+                apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1303.equals(inteId)) {
             SX2024Api1303 apiData = new SX2024Api1303();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
-            String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
-            apiData.setTyajbm(tyajbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆绲变竴寤掗棿缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyajbm())) {
+                String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
+                apiData.setTyajbm(tyajbm);
+            }
+            //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+            if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
+                apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1304.equals(inteId)) {
             SX2024Api1304 apiData = new SX2024Api1304();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
-            String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
-            apiData.setTyajbm(tyajbm);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
+            //璁剧疆绲变竴寤掗棿缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyajbm())) {
+                String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
+                apiData.setTyajbm(tyajbm);
+            }
+            //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+            if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
+                apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1305.equals(inteId)) {
+            Api1305 api1305 = (Api1305) data;
             SX2024Api1305 apiData = new SX2024Api1305();
-            BeanUtils.copyProperties(data, apiData);
-            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
-            apiData.setTycfbm(tycfbm);
-            //todo 缁熶竴璐т綅缂栫爜
-
+            BeanUtils.copyProperties(api1305, apiData);
+            //璁剧疆绲变竴浠撴埧缂栫爜
+            if (StringUtils.isEmpty(apiData.getTycfbm())) {
+                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+                apiData.setTycfbm(tycfbm);
+            }
+            //璁剧疆绲变竴寤掗棿缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyajbm())) {
+                String tyajbm = apiCommonService.getTyajbm(api1305.getHwdm().substring(0, 28));
+                apiData.setTyajbm(tyajbm);
+            }
+            //璁剧疆閫氶浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+            if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
+                apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1306.equals(inteId)) {
+            Api1306 api1306 = (Api1306) data;
             SX2024Api1306 apiData = new SX2024Api1306();
-            BeanUtils.copyProperties(data, apiData);
-            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
-            apiData.setTycfbm(tycfbm);
-            //todo 缁熶竴璐т綅缂栫爜
+            BeanUtils.copyProperties(api1306, apiData);
+            //璁剧疆绲变竴浠撴埧缂栫爜
+            if (StringUtils.isEmpty(apiData.getTycfbm())) {
+                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+                apiData.setTycfbm(tycfbm);
+            }
+            //璁剧疆绲变竴寤掗棿缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyajbm())) {
+                String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
+                apiData.setTyajbm(tyajbm);
+            }
+            //璁剧疆鐔忚捀浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+            if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
+                apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
+            }
+            //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+            if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
+                apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1307.equals(inteId)) {
             Api1307 api1307 = (Api1307) data;
             SX2024Api1307 apiData = new SX2024Api1307();
             BeanUtils.copyProperties(api1307, apiData);
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
-            apiData.setTycfbm(tycfbm);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
-            apiData.setTyhwbm(tyhwbm);
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //璁剧疆绲变竴浠撴埧缂栫爜
+            if (StringUtils.isEmpty(apiData.getTycfbm())) {
+                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+                apiData.setTycfbm(tycfbm);
+            }
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
             //璁剧疆鏂囦欢娴�
             apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
-
-            //todo 浠撳唴鍥惧儚鏂囦欢璺緞 CNTXWJLJ
+            //棰勭疆浣�
+            if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
+                apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1308.equals(inteId)) {
             SX2024Api1308 apiData = new SX2024Api1308();
             BeanUtils.copyProperties(data, apiData);
-            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
-            apiData.setTykqbm(tykqbm);
-
-            //todo 瑙嗛鏂囦欢璺緞 SPWJLJ
+            //璁剧疆绲变竴搴撳尯缂栫爜
+            if (StringUtils.isEmpty(apiData.getTykqbm())) {
+                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+                apiData.setTykqbm(tykqbm);
+            }
+            //缁熶竴搴撳尯鍚嶇О
+            apiData.setTykqmc(apiData.getKqmc());
             return apiData;
         }
         if (Constant.API_CODE_1309.equals(inteId)) {
+            Api1309 api1309 = (Api1309) data;
             SX2024Api1309 apiData = new SX2024Api1309();
-            BeanUtils.copyProperties(data, apiData);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
-            apiData.setWgdwtybm(tydwbm);
+            BeanUtils.copyProperties(api1309, apiData);
+            //璁剧疆杩濊鍗曚綅绲变竴缂栫爜
+            if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
+                apiData.setWgdwtybm(tydwbm);
+            }
+            //璁剧疆棰勮淇℃伅浠g爜锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+            if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
+                String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
+                apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
+            }
             return apiData;
         }
         if (Constant.API_CODE_1310.equals(inteId)) {
             SX2024Api1310 apiData = new SX2024Api1310();
             BeanUtils.copyProperties(data, apiData);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+                apiData.setTyhwbm(tyhwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1401.equals(inteId)) {
             SX2024Api1401 apiData = new SX2024Api1401();
             BeanUtils.copyProperties(data, apiData);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
-            apiData.setTydwbm(tydwbm);
-            apiData.setCcqytydm(tydwbm);
+            //璁剧疆鎵垮偍浼佷笟缁熶竴缂栫爜銆佺粺涓�鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getCcqytydm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
+                apiData.setCcqytydm(tydwbm);
+                apiData.setTydwbm(tydwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1403.equals(inteId)) {
             SX2024Api1403 apiData = new SX2024Api1403();
             BeanUtils.copyProperties(data, apiData);
-            String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
-            apiData.setJHXDDWTYBM(tydwbm);
+            //璁剧疆绲变竴鍗曚綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getJhxddwtybm())) {
+                String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
+                apiData.setJhxddwtybm(tydwbm);
+            }
             return apiData;
         }
         if (Constant.API_CODE_1404.equals(inteId)) {
+            Api1404 api1404 = (Api1404) data;
             SX2024Api1404 apiData = new SX2024Api1404();
+            BeanUtils.copyProperties(api1404, apiData);
+            //璁剧疆绲变竴璐т綅缂栫爜
+            if (StringUtils.isEmpty(apiData.getLhhwtybm())) {
+                String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
+                apiData.setLhhwtybm(tyhwbm);
+            }
+            //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+            if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
+                String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
+                apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
+            }
+            return apiData;
+        }
+        if (Constant.API_CODE_1504.equals(inteId)) {
+            Api1504 api1504 = (Api1504)data;
+            SX2024Api1504 apiData = new SX2024Api1504();
+            BeanUtils.copyProperties(api1504, apiData);
+            return apiData;
+        }
+        if (Constant.API_CODE_1505.equals(inteId)) {
+            SX2024Api1505 apiData = new SX2024Api1505();
             BeanUtils.copyProperties(data, apiData);
-            String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
-            apiData.setLhhwtybm(tyhwbm);
+            return apiData;
+        }
+        if (Constant.API_CODE_1506.equals(inteId)) {
+            SX2024Api1506 apiData = new SX2024Api1506();
+            BeanUtils.copyProperties(data, apiData);
+            return apiData;
+        }
+        if (Constant.API_CODE_1507.equals(inteId)) {
+            SX2024Api1507 apiData = new SX2024Api1507();
+            BeanUtils.copyProperties(data, apiData);
+            return apiData;
+        }
+        if (Constant.API_CODE_1508.equals(inteId)) {
+            SX2024Api1508 apiData = new SX2024Api1508();
+            BeanUtils.copyProperties(data, apiData);
+            return apiData;
+        }
+        if (Constant.API_CODE_1509.equals(inteId)) {
+            SX2024Api1509 apiData = new SX2024Api1509();
+            BeanUtils.copyProperties(data, apiData);
+            return apiData;
+        }
+        if (Constant.API_CODE_1510.equals(inteId)) {
+            SX2024Api1510 apiData = new SX2024Api1510();
+            BeanUtils.copyProperties(data, apiData);
             return apiData;
         }
         return data;
@@ -554,255 +904,6 @@
             e.printStackTrace();
         }
         return object;
-    }
-
-    /**
-     * 鑾峰彇璐㈠姟灏佽鏁版嵁
-     *
-     * @param inteId
-     * @param data
-     * @return
-     */
-    private List<SXFinanceDto> getFinanceData(String inteId, Object data) {
-        //璐㈠姟鎶ヨ〃鏁版嵁灏佽
-        if (Constant.API_CODE_1114_1501.equals(inteId)) {
-            return copyApi1501((Api1501) data);
-        } else if (Constant.API_CODE_1114_1502.equals(inteId)) {
-            return copyApi1502((Api1502) data);
-        } else {
-            return copyApi1503((Api1503) data);
-        }
-    }
-
-    /**
-     * 灏佽1501-璧勪骇璐熷�烘暟鎹�
-     *
-     * @param api1503
-     * @return
-     */
-    private List<SXFinanceDto> copyApi1503(Api1503 api1503) {
-        List<SXFinanceDto> list = new ArrayList<>();
-        SXFinanceDto SXFinanceDto = new SXFinanceDto();
-        SXFinanceDto.setDWDM(api1503.getDwdm());
-        SXFinanceDto.setKQDM(api1503.getKqdm());
-        SXFinanceDto.setBBSJ(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
-        SXFinanceDto.setBBM("03");
-        SXFinanceDto.setCZBZ(api1503.getCzbz());
-        SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
-        paddingData(SXFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
-        paddingData(SXFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
-        paddingData(SXFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
-        paddingData(SXFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
-        paddingData(SXFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
-        paddingData(SXFinanceDto, list, "5", "绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
-        paddingData(SXFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
-        paddingData(SXFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
-        paddingData(SXFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
-        paddingData(SXFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
-        paddingData(SXFinanceDto, list, "10", "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
-        paddingData(SXFinanceDto, list, "11", "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
-        paddingData(SXFinanceDto, list, "12", "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
-        paddingData(SXFinanceDto, list, "13", "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
-        paddingData(SXFinanceDto, list, "14", "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
-        paddingData(SXFinanceDto, list, "15", "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
-        paddingData(SXFinanceDto, list, "16", "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
-        paddingData(SXFinanceDto, list, "17", "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
-        paddingData(SXFinanceDto, list, "18", "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
-        paddingData(SXFinanceDto, list, "19", "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
-        paddingData(SXFinanceDto, list, "20", "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
-        paddingData(SXFinanceDto, list, "21", "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
-        paddingData(SXFinanceDto, list, "22", "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
-        paddingData(SXFinanceDto, list, "23", "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
-        paddingData(SXFinanceDto, list, "24", "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
-        paddingData(SXFinanceDto, list, "25", "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
-        paddingData(SXFinanceDto, list, "26", "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
-        paddingData(SXFinanceDto, list, "27", "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
-        paddingData(SXFinanceDto, list, "28", "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
-        paddingData(SXFinanceDto, list, "29", "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
-        paddingData(SXFinanceDto, list, "30", "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
-        paddingData(SXFinanceDto, list, "31", "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
-        paddingData(SXFinanceDto, list, "32", "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
-        paddingData(SXFinanceDto, list, "33", "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
-        paddingData(SXFinanceDto, list, "34", "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
-        paddingData(SXFinanceDto, list, "35", "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
-        paddingData(SXFinanceDto, list, "36", "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
-
-        return list;
-    }
-
-    /**
-     * 灏佽1502-鐜伴噾娴佹暟鎹�
-     *
-     * @param api1502
-     * @return
-     */
-    private List<SXFinanceDto> copyApi1502(Api1502 api1502) {
-        List<SXFinanceDto> list = new ArrayList<>();
-        SXFinanceDto SXFinanceDto = new SXFinanceDto();
-        SXFinanceDto.setDWDM(api1502.getDwdm());
-        SXFinanceDto.setKQDM(api1502.getKqdm());
-        SXFinanceDto.setBBSJ(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
-        SXFinanceDto.setBBM("02");
-        SXFinanceDto.setCZBZ(api1502.getCzbz());
-        SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
-        paddingData(SXFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
-        paddingData(SXFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
-        paddingData(SXFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
-        paddingData(SXFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
-        paddingData(SXFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
-        paddingData(SXFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
-        paddingData(SXFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "10", "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
-        paddingData(SXFinanceDto, list, "11", "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
-        paddingData(SXFinanceDto, list, "12", "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
-        paddingData(SXFinanceDto, list, "13", "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "14", "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "15", "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
-        paddingData(SXFinanceDto, list, "16", "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
-        paddingData(SXFinanceDto, list, "17", "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "18", "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
-        paddingData(SXFinanceDto, list, "19", "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "20", "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "21", "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
-        paddingData(SXFinanceDto, list, "22", "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "23", "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
-        paddingData(SXFinanceDto, list, "24", "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
-        paddingData(SXFinanceDto, list, "25", "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
-        paddingData(SXFinanceDto, list, "26", "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "27", "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "28", "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "29", "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
-        paddingData(SXFinanceDto, list, "30", "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "31", "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "32", "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
-        paddingData(SXFinanceDto, list, "33", "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
-        paddingData(SXFinanceDto, list, "34", "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
-        paddingData(SXFinanceDto, list, "35", "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
-        paddingData(SXFinanceDto, list, "36", "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
-        paddingData(SXFinanceDto, list, "37", "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
-        paddingData(SXFinanceDto, list, "38", "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
-
-        return list;
-    }
-
-    /**
-     * 灏佽1503-鍒╂鼎琛ㄦ暟鎹�
-     *
-     * @param api1501
-     * @return
-     */
-    private List<SXFinanceDto> copyApi1501(Api1501 api1501) {
-        List<SXFinanceDto> list = new ArrayList<>();
-        SXFinanceDto SXFinanceDto = new SXFinanceDto();
-        SXFinanceDto.setDWDM(api1501.getDwdm());
-        SXFinanceDto.setKQDM(api1501.getKqdm());
-        SXFinanceDto.setBBSJ(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
-        SXFinanceDto.setBBM("01");
-        SXFinanceDto.setCZBZ(api1501.getCzbz());
-        SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
-        paddingData(SXFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
-        paddingData(SXFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
-        paddingData(SXFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
-        paddingData(SXFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
-        paddingData(SXFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
-        paddingData(SXFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
-        paddingData(SXFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
-        paddingData(SXFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
-        paddingData(SXFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
-        paddingData(SXFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
-        paddingData(SXFinanceDto, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
-        paddingData(SXFinanceDto, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
-        paddingData(SXFinanceDto, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
-        paddingData(SXFinanceDto, list, "13", "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
-        paddingData(SXFinanceDto, list, "14", "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
-        paddingData(SXFinanceDto, list, "15", "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
-        paddingData(SXFinanceDto, list, "16", "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
-        paddingData(SXFinanceDto, list, "17", "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
-        paddingData(SXFinanceDto, list, "18", "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
-        paddingData(SXFinanceDto, list, "19", "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
-        paddingData(SXFinanceDto, list, "20", "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
-        paddingData(SXFinanceDto, list, "21", "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
-        paddingData(SXFinanceDto, list, "22", "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
-        paddingData(SXFinanceDto, list, "23", "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
-        paddingData(SXFinanceDto, list, "24", "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
-        paddingData(SXFinanceDto, list, "25", "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
-        paddingData(SXFinanceDto, list, "26", "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
-        paddingData(SXFinanceDto, list, "27", "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
-        paddingData(SXFinanceDto, list, "28", "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
-        paddingData(SXFinanceDto, list, "29", "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
-        paddingData(SXFinanceDto, list, "30", "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
-        paddingData(SXFinanceDto, list, "31", "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
-        paddingData(SXFinanceDto, list, "32", "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
-        paddingData(SXFinanceDto, list, "33", "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
-        paddingData(SXFinanceDto, list, "34", "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
-        paddingData(SXFinanceDto, list, "35", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
-        paddingData(SXFinanceDto, list, "36", "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
-        paddingData(SXFinanceDto, list, "37", "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
-        paddingData(SXFinanceDto, list, "38", "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
-        paddingData(SXFinanceDto, list, "39", "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
-        paddingData(SXFinanceDto, list, "40", "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
-        paddingData(SXFinanceDto, list, "41", "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
-        paddingData(SXFinanceDto, list, "42", "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
-        paddingData(SXFinanceDto, list, "43", "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
-        paddingData(SXFinanceDto, list, "44", "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
-        paddingData(SXFinanceDto, list, "45", "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
-        paddingData(SXFinanceDto, list, "46", "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
-        paddingData(SXFinanceDto, list, "47", "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
-        paddingData(SXFinanceDto, list, "48", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
-        paddingData(SXFinanceDto, list, "49", "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
-        paddingData(SXFinanceDto, list, "50", "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
-        paddingData(SXFinanceDto, list, "51", "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
-        paddingData(SXFinanceDto, list, "52", "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
-        paddingData(SXFinanceDto, list, "53", "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
-        paddingData(SXFinanceDto, list, "54", "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
-        paddingData(SXFinanceDto, list, "55", "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
-        paddingData(SXFinanceDto, list, "56", "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
-        paddingData(SXFinanceDto, list, "57", "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
-        paddingData(SXFinanceDto, list, "58", "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
-        paddingData(SXFinanceDto, list, "59", "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
-        paddingData(SXFinanceDto, list, "60", "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
-        paddingData(SXFinanceDto, list, "61", "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
-        paddingData(SXFinanceDto, list, "62", "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
-        paddingData(SXFinanceDto, list, "63", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
-        paddingData(SXFinanceDto, list, "64", "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
-        paddingData(SXFinanceDto, list, "65", "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
-        paddingData(SXFinanceDto, list, "66", "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
-        paddingData(SXFinanceDto, list, "67", "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
-        paddingData(SXFinanceDto, list, "68", "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
-        paddingData(SXFinanceDto, list, "69", "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
-        paddingData(SXFinanceDto, list, "70", "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
-        paddingData(SXFinanceDto, list, "71", "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
-        paddingData(SXFinanceDto, list, "72", "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
-        paddingData(SXFinanceDto, list, "73", "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
-        paddingData(SXFinanceDto, list, "74", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
-        paddingData(SXFinanceDto, list, "75", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
-        return list;
-    }
-
-    /**
-     * 璐㈠姟鏁版嵁灏佽
-     *
-     * @param common
-     * @param list
-     * @param zbxh
-     * @param zbmc
-     * @param zbz1
-     * @param zbz2
-     */
-    private void paddingData(SXFinanceDto common, List<SXFinanceDto> list, String zbxh, String zbmc, String zbz1, String zbz2) {
-        SXFinanceDto SXFinanceDto = new SXFinanceDto();
-        BeanUtils.copyProperties(common, SXFinanceDto);
-        SXFinanceDto.setZBXH(zbxh);
-        SXFinanceDto.setZBMC(zbmc);
-        SXFinanceDto.setZBZ1(zbz1);
-        SXFinanceDto.setZBZ2(zbz2);
-        list.add(SXFinanceDto);
     }
 
     /**
@@ -861,6 +962,8 @@
                 return SX2024Constant.SX_2024_API_ODS_UP_ZMKCXXJK;
             case "1212":
                 return SX2024Constant.SX_2024_API_ODS_UP_KHXXJK;
+            case "1213":
+                return SX2024Constant.SX_2024_API_ODS_UP_FCQRDXXJK;
             case "1301":
                 return SX2024Constant.SX_2024_API_ODS_UP_AQGLXXJK;
             case "1302":
@@ -887,12 +990,20 @@
                 return SX2024Constant.SX_2024_API_ODS_UP_LHJHXXJK;
             case "1404":
                 return SX2024Constant.SX_2024_API_ODS_UP_LHJHMXXXJK;
-            case "1501":
-                return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
-            case "1502":
-                return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
-            case "1503":
-                return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
+            case "1504":
+                return SX2024Constant.SX_2024_API_ODS_UP_ZTXXJK;
+            case "1505":
+                return SX2024Constant.SX_2024_API_ODS_UP_KMXXJK;
+            case "1506":
+                return SX2024Constant.SX_2024_API_ODS_UP_KMYEXXJK;
+            case "1507":
+                return SX2024Constant.SX_2024_API_ODS_UP_HJPZXXJK;
+            case "1508":
+                return SX2024Constant.SX_2024_API_ODS_UP_XJLLFPXXJK;
+            case "1509":
+                return SX2024Constant.SX_2024_API_ODS_UP_GDZCKPXXJK;
+            case "1510":
+                return SX2024Constant.SX_2024_API_ODS_UP_ZCZJXXJK;
             default:
                 return inteId;
         }

--
Gitblit v1.9.3