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/sh2023/SH2023ApiRemoteService.java | 596 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 331 insertions(+), 265 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 6b7d07f..bf887fd 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1,7 +1,6 @@
package com.fzzy.push.sh2023;
import com.alibaba.fastjson.JSON;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -11,10 +10,7 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.push.gd2022.GD2022HttpClientUtil;
-import com.fzzy.push.gd2022.dto.GD2022AuthToken;
-import com.fzzy.push.gd2022.dto.GD2022ResponseDto;
-import com.fzzy.push.gd2022.dto.GDFinanceDto;
+import com.fzzy.order.data.OrderData;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -23,12 +19,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
@@ -72,15 +63,10 @@
@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();
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(conf.getKqdm());
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
@@ -89,9 +75,15 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
+
+
+ //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
+ if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) {
+ inteId = SH2023Constant.SH_2023_API_CODE_1114;
+ }
apiLog.setInteId(inteId);
- String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
- log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
if (StringUtils.isEmpty(inteId)) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
@@ -100,6 +92,9 @@
apiLogRep.save(apiLog);
return responseDto;
}
+
+ String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
+ log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
@@ -112,31 +107,45 @@
return responseDto;
}
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ OrderData orderData = (OrderData) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderData.getOrderid())) {
+ log.error("鎸囦护id澶辨晥=" + jsonData);
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
SH2023ReqDto reqData = new SH2023ReqDto();
reqData.setId(ContextUtil.getUUID());
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
- if (null == api1102List || api1102List.isEmpty()) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLog.setStatus(99);
- apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLogRep.save(apiLog);
- return responseDto;
- }
- reqData.setUid(api1102List.get(0).getXzqhdm());
+ reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(param.getOrderid());
- //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
+ reqData.setOrderid(orderData.getOrderid());
+
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
+ reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
- List<Object> list = (List<Object>) data;
- reqData.setDatalength(list.size());
- //鏁版嵁杩涜SM4鍔犲瘑
- reqData.setData(jsonData);
+ if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) {
+ reqData.setDatalength(1);
+ }else {
+ List<Object> list = (List<Object>) data;
+ reqData.setDatalength(list.size());
+ }
+
+ //浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
+ reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
- SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData, conf);
+ SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
+
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
apiLogRep.save(apiLog);
@@ -153,6 +162,7 @@
/**
* 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
+ *
* @param param
* @param conf
* @param data
@@ -172,7 +182,7 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
- apiLog.setInteId(inteId);
+ apiLog.setInteId("1114");
String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
@@ -195,31 +205,37 @@
return responseDto;
}
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ OrderData orderData = (OrderData) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderData.getOrderid())) {
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
SH2023ReqDto reqData = new SH2023ReqDto();
reqData.setId(ContextUtil.getUUID());
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
- if (null == api1102List || api1102List.isEmpty()) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLog.setStatus(99);
- apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLogRep.save(apiLog);
- return responseDto;
- }
- reqData.setUid(api1102List.get(0).getXzqhdm());
+ reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(param.getOrderid());
- //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
+ reqData.setOrderid(orderData.getOrderid());
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
+ reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
List<Object> list = (List<Object>) data;
reqData.setDatalength(list.size());
- //鏁版嵁杩涜SM4鍔犲瘑
- reqData.setData(jsonData);
+
+ //浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
+ reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
+
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
- SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData, conf);
+ SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
apiLogRep.save(apiLog);
@@ -260,7 +276,8 @@
list.add(api1101);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1102.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1102.equals(inteId)) {
SH2023Api1102 api1102;
//鏈�鍚庤浆鎹负json
List<SH2023Api1102> list = new ArrayList<>();
@@ -278,11 +295,13 @@
BeanUtils.copyProperties(apiData, api1102);
api1102.setAjs(api1104List.size());
api1102.setBjw(ShAreaBjw.getBjw(code));
+ api1102.setKqsx("2");
api1102.setCbcr(count);
list.add(api1102);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1103.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1103.equals(inteId)) {
SH2023Api1103 api1103;
//鏈�鍚庤浆鎹负json
List<SH2023Api1103> list = new ArrayList<>();
@@ -298,7 +317,8 @@
list.add(api1103);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
SH2023Api1104 api1104;
//鏈�鍚庤浆鎹负json
List<SH2023Api1104> list = new ArrayList<>();
@@ -314,7 +334,8 @@
list.add(api1104);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
SH2023Api1105 api1105;
//鏈�鍚庤浆鎹负json
List<SH2023Api1105> list = new ArrayList<>();
@@ -327,7 +348,8 @@
list.add(api1105);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
SH2023Api1106 api1106;
//鏈�鍚庤浆鎹负json
List<SH2023Api1106> list = new ArrayList<>();
@@ -340,7 +362,8 @@
list.add(api1106);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1107.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1107.equals(inteId)) {
SH2023Api1107 api1107;
//鏈�鍚庤浆鎹负json
List<SH2023Api1107> list = new ArrayList<>();
@@ -353,7 +376,8 @@
list.add(api1107);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1108.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1108.equals(inteId)) {
SH2023Api1108 api1108;
//鏈�鍚庤浆鎹负json
List<SH2023Api1108> list = new ArrayList<>();
@@ -366,22 +390,29 @@
list.add(api1108);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1109.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1109.equals(inteId)) {
SH2023Api1109 api1109;
//鏈�鍚庤浆鎹负json
List<SH2023Api1109> list = new ArrayList<>();
- FileUtil file = new FileUtil();
//鎶奷ata杞寲鎴恖ist闆嗗悎
List<Api1109> api1109List = castList(data, Api1109.class);
+ Map<String, String> map;
for (Api1109 apiData : api1109List) {
api1109 = new SH2023Api1109();
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
- api1109.setWjl(file.imgToIo(apiData.getWjdz() + apiData.getWjmc()));
+ if ("1".equals(api1109.getWjlx())) {
+ api1109.setYwdh("鏃�");
+ }
+ map = new HashMap<>();
+ map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
+ api1109.setWjl(JSON.toJSONString(map));
list.add(api1109);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1110.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1110.equals(inteId)) {
SH2023Api1110 api1110;
//鏈�鍚庤浆鎹负json
List<SH2023Api1110> list = new ArrayList<>();
@@ -402,7 +433,8 @@
list.add(api1110);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1111.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1111.equals(inteId)) {
SH2023Api1111 api1111;
//鏈�鍚庤浆鎹负json
List<SH2023Api1111> list = new ArrayList<>();
@@ -415,7 +447,8 @@
list.add(api1111);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1112.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1112.equals(inteId)) {
SH2023Api1112 api1112;
//鏈�鍚庤浆鎹负json
List<SH2023Api1112> list = new ArrayList<>();
@@ -424,11 +457,13 @@
for (Api1112 apiData : api1112List) {
api1112 = new SH2023Api1112();
BeanUtils.copyProperties(apiData, api1112);
+ api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
list.add(api1112);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1113.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1113.equals(inteId)) {
SH2023Api1113 api1113;
//鏈�鍚庤浆鎹负json
List<SH2023Api1113> list = new ArrayList<>();
@@ -441,7 +476,8 @@
list.add(api1113);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
SH2023Api1201 api1201;
//鏈�鍚庤浆鎹负json
List<SH2023Api1201> list = new ArrayList<>();
@@ -455,7 +491,8 @@
list.add(api1201);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1202.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1202.equals(inteId)) {
SH2023Api1202 api1202;
//鏈�鍚庤浆鎹负json
List<SH2023Api1202> list = new ArrayList<>();
@@ -471,7 +508,8 @@
list.add(api1202);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1203.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1203.equals(inteId)) {
SH2023Api1203 api1203;
//鏈�鍚庤浆鎹负json
List<SH2023Api1203> list = new ArrayList<>();
@@ -487,7 +525,8 @@
list.add(api1203);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1204.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1204.equals(inteId)) {
SH2023Api1204 api1204;
//鏈�鍚庤浆鎹负json
List<SH2023Api1204> list = new ArrayList<>();
@@ -501,7 +540,8 @@
list.add(api1204);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1205.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1205.equals(inteId)) {
SH2023Api1205 api1205;
//鏈�鍚庤浆鎹负json
List<SH2023Api1205> list = new ArrayList<>();
@@ -513,10 +553,13 @@
api1205.setBjw(ShAreaBjw.getBjw(code));
api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
api1205.setJzrq(apiData.getCmsj());
+ api1205.setJhmxh("鏃�");
+ api1205.setJjlx("鏃�");
list.add(api1205);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1206.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1206.equals(inteId)) {
SH2023Api1206 api1206;
//鏈�鍚庤浆鎹负json
List<SH2023Api1206> list = new ArrayList<>();
@@ -531,7 +574,8 @@
list.add(api1206);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
SH2023Api1207 api1207;
//鏈�鍚庤浆鎹负json
List<SH2023Api1207> list = new ArrayList<>();
@@ -548,7 +592,8 @@
list.add(api1207);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) {
SH2023Api1208 api1208;
//鏈�鍚庤浆鎹负json
List<SH2023Api1208> list = new ArrayList<>();
@@ -566,7 +611,8 @@
list.add(api1208);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1209.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1209.equals(inteId)) {
SH2023Api1209 api1209;
//鏈�鍚庤浆鎹负json
List<SH2023Api1209> list = new ArrayList<>();
@@ -575,16 +621,19 @@
for (Api1209 apiData : api1209List) {
api1209 = new SH2023Api1209();
BeanUtils.copyProperties(apiData, api1209);
- // TODO 璁拌处鏃ユ湡 鍗曟嵁绫诲瀷
+ api1209.setDjlx("2");
api1209.setSzjl(apiData.getQzszkl());
api1209.setZrshde(apiData.getQzzrshde());
api1209.setBjw(ShAreaBjw.getBjw(code));
+ api1209.setJzrq(apiData.getYwrq());
+ api1209.setBz("鏃�");
api1209.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyy"));
list.add(api1209);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1210.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1210.equals(inteId)) {
SH2023Api1210 api1210;
//鏈�鍚庤浆鎹负json
List<SH2023Api1210> list = new ArrayList<>();
@@ -599,7 +648,8 @@
list.add(api1210);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1211.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1211.equals(inteId)) {
SH2023Api1211 api1211;
//鏈�鍚庤浆鎹负json
List<SH2023Api1211> list = new ArrayList<>();
@@ -615,7 +665,8 @@
list.add(api1211);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
SH2023Api1212 api1212;
//鏈�鍚庤浆鎹负json
List<SH2023Api1212> list = new ArrayList<>();
@@ -628,7 +679,8 @@
list.add(api1212);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
SH2023Api1301 api1301;
//鏈�鍚庤浆鎹负json
List<SH2023Api1301> list = new ArrayList<>();
@@ -641,7 +693,8 @@
list.add(api1301);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1302.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1302.equals(inteId)) {
SH2023Api1302 api1302;
//鏈�鍚庤浆鎹负json
List<SH2023Api1302> list = new ArrayList<>();
@@ -652,11 +705,17 @@
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
api1302.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
- //todo 娓╂箍搴︽娴嬫暟鎹笉鍏�
+ api1302.setCpjw(String.valueOf(apiData.getLspjw()));
+ api1302.setCzgw(String.valueOf(apiData.getLspjw()));
+ api1302.setCzdw(String.valueOf(apiData.getLspjw()));
+ api1302.setGfwjw(String.valueOf(apiData.getLspjw()));
+ api1302.setLwmx(apiData.getLswdzjh());
+
list.add(api1302);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1303.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1303.equals(inteId)) {
SH2023Api1303 api1303;
//鏈�鍚庤浆鎹负json
List<SH2023Api1303> list = new ArrayList<>();
@@ -670,7 +729,8 @@
list.add(api1303);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1304.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1304.equals(inteId)) {
SH2023Api1304 api1304;
//鏈�鍚庤浆鎹负json
List<SH2023Api1304> list = new ArrayList<>();
@@ -684,7 +744,8 @@
list.add(api1304);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1305.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1305.equals(inteId)) {
SH2023Api1305 api1305;
//鏈�鍚庤浆鎹负json
List<SH2023Api1305> list = new ArrayList<>();
@@ -698,7 +759,8 @@
list.add(api1305);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1306.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1306.equals(inteId)) {
SH2023Api1306 api1306;
//鏈�鍚庤浆鎹负json
List<SH2023Api1306> list = new ArrayList<>();
@@ -713,7 +775,8 @@
list.add(api1306);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1307.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1307.equals(inteId)) {
SH2023Api1307 api1307;
//鏈�鍚庤浆鎹负json
List<SH2023Api1307> list = new ArrayList<>();
@@ -729,7 +792,8 @@
list.add(api1307);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
SH2023Api1310 api1310;
//鏈�鍚庤浆鎹负json
List<SH2023Api1310> list = new ArrayList<>();
@@ -746,7 +810,8 @@
list.add(api1310);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
SH2023Api1401 api1401;
//鏈�鍚庤浆鎹负json
List<SH2023Api1401> list = new ArrayList<>();
@@ -755,11 +820,11 @@
for (Api1401 apiData : api1401List) {
api1401 = new SH2023Api1401();
BeanUtils.copyProperties(apiData, api1401);
- api1401.setBjw(ShAreaBjw.getBjw(code));
list.add(api1401);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1402.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1402.equals(inteId)) {
SH2023Api1402 api1402;
//鏈�鍚庤浆鎹负json
List<SH2023Api1402> list = new ArrayList<>();
@@ -772,7 +837,8 @@
list.add(api1402);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) {
SH2023Api1403 api1403;
//鏈�鍚庤浆鎹负json
List<SH2023Api1403> list = new ArrayList<>();
@@ -786,7 +852,8 @@
list.add(api1403);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1404.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1404.equals(inteId)) {
SH2023Api1404 api1404;
//鏈�鍚庤浆鎹负json
List<SH2023Api1404> list = new ArrayList<>();
@@ -801,22 +868,8 @@
}
return JSON.toJSONString(list);
}
-// TODO 椤圭洰淇℃伅
-// else if (SH2023Constant.SH_2023_API_CODE_1405.equals(inteId)) {
-// SH2023Api1405 api1405;
-// //鏈�鍚庤浆鎹负json
-// List<SH2023Api1405> list = new ArrayList<>();
-// //鎶奷ata杞寲鎴恖ist闆嗗悎
-// List<Api1405> api1405List = castList(data, Api1405.class);
-// for (Api1405 apiData : api1405List) {
-// api1405 = new SH2023Api1405();
-// BeanUtils.copyProperties(apiData, api1405);
-//
-// list.add(api1405);
-// }
-// return JSON.toJSONString(list);
-// }
- else if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+
+ if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
SH2023Api2102 api2102;
//鏈�鍚庤浆鎹负json
List<SH2023Api2102> list = new ArrayList<>();
@@ -834,7 +887,8 @@
list.add(api2102);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
SH2023Api2203 api2203;
//鏈�鍚庤浆鎹负json
List<SH2023Api2203> list = new ArrayList<>();
@@ -856,7 +910,8 @@
list.add(api2203);
}
return JSON.toJSONString(list);
- }else if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
SH2023Api2204 api2204;
//鏈�鍚庤浆鎹负json
List<SH2023Api2204> list = new ArrayList<>();
@@ -873,9 +928,22 @@
list.add(api2204);
}
return JSON.toJSONString(list);
- } else {
- return JSON.toJSONString(data);
}
+ //璐㈠姟鎶ヨ〃鏁版嵁灏佽
+ if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(inteId)){
+ List<SHFinanceDto> list = copyApi1501((Api1501) data);
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1114_1502.equals(inteId)){
+ List<SHFinanceDto> list = copyApi1502((Api1502) data);
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1114_1503.equals(inteId)){
+ List<SHFinanceDto> list = copyApi1503((Api1503) data);
+ return JSON.toJSONString(list);
+ }
+
+ return JSON.toJSONString(data);
}
/**
@@ -908,43 +976,43 @@
shFinanceDto.setCzbz(api1503.getCzbz());
shFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
- paddingData(shFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
- paddingData(shFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
- paddingData(shFinanceDto, list, 3, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
- paddingData(shFinanceDto, list, 4, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
- paddingData(shFinanceDto, list, 5, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
- paddingData(shFinanceDto, list, 6, "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
- paddingData(shFinanceDto, list, 7, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
- paddingData(shFinanceDto, list, 8, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
- paddingData(shFinanceDto, list, 9, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
- paddingData(shFinanceDto, list, 10, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
- paddingData(shFinanceDto, list, 11, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
- paddingData(shFinanceDto, list, 12, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
- paddingData(shFinanceDto, list, 13, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
- paddingData(shFinanceDto, list, 14, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
- paddingData(shFinanceDto, list, 15, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
- paddingData(shFinanceDto, list, 16, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
- paddingData(shFinanceDto, list, 17, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
- paddingData(shFinanceDto, list, 18, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
- paddingData(shFinanceDto, list, 19, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
- paddingData(shFinanceDto, list, 20, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
- paddingData(shFinanceDto, list, 21, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
- paddingData(shFinanceDto, list, 22, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
- paddingData(shFinanceDto, list, 23, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
- paddingData(shFinanceDto, list, 24, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
- paddingData(shFinanceDto, list, 25, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
- paddingData(shFinanceDto, list, 26, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
- paddingData(shFinanceDto, list, 27, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
- paddingData(shFinanceDto, list, 28, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
- paddingData(shFinanceDto, list, 29, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
- paddingData(shFinanceDto, list, 30, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(shFinanceDto, list, 31, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(shFinanceDto, list, 32, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
- paddingData(shFinanceDto, list, 33, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
- paddingData(shFinanceDto, list, 34, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
- paddingData(shFinanceDto, list, 35, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
- paddingData(shFinanceDto, list, 36, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
- paddingData(shFinanceDto, list, 37, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
+ paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+ paddingData(shFinanceDto, list, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+ paddingData(shFinanceDto, list, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+ paddingData(shFinanceDto, list, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+ paddingData(shFinanceDto, list, "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+ paddingData(shFinanceDto, list, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+ paddingData(shFinanceDto, list, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+ paddingData(shFinanceDto, list, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+ paddingData(shFinanceDto, list, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+ paddingData(shFinanceDto, list, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+ paddingData(shFinanceDto, list, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+ paddingData(shFinanceDto, list, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+ paddingData(shFinanceDto, list, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+ paddingData(shFinanceDto, list, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+ paddingData(shFinanceDto, list, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+ paddingData(shFinanceDto, list, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+ paddingData(shFinanceDto, list, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+ paddingData(shFinanceDto, list, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+ paddingData(shFinanceDto, list, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+ paddingData(shFinanceDto, list, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
return list;
}
@@ -959,45 +1027,45 @@
shFinanceDto.setCzbz(api1502.getCzbz());
shFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
- paddingData(shFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
- paddingData(shFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
- paddingData(shFinanceDto, list, 3, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
- paddingData(shFinanceDto, list, 4, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
- paddingData(shFinanceDto, list, 5, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
- paddingData(shFinanceDto, list, 6, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
- paddingData(shFinanceDto, list, 7, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
- paddingData(shFinanceDto, list, 8, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
- paddingData(shFinanceDto, list, 9, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
- paddingData(shFinanceDto, list, 10, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
- paddingData(shFinanceDto, list, 11, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
- paddingData(shFinanceDto, list, 12, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
- paddingData(shFinanceDto, list, 13, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
- paddingData(shFinanceDto, list, 14, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
- paddingData(shFinanceDto, list, 15, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
- paddingData(shFinanceDto, list, 16, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
- paddingData(shFinanceDto, list, 17, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
- paddingData(shFinanceDto, list, 18, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(shFinanceDto, list, 19, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
- paddingData(shFinanceDto, list, 20, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
- paddingData(shFinanceDto, list, 21, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
- paddingData(shFinanceDto, list, 22, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
- paddingData(shFinanceDto, list, 23, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
- paddingData(shFinanceDto, list, 24, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
- paddingData(shFinanceDto, list, 25, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
- paddingData(shFinanceDto, list, 26, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
- paddingData(shFinanceDto, list, 27, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
- paddingData(shFinanceDto, list, 28, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
- paddingData(shFinanceDto, list, 29, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(shFinanceDto, list, 30, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
- paddingData(shFinanceDto, list, 31, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
- paddingData(shFinanceDto, list, 32, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
- paddingData(shFinanceDto, list, 33, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
- paddingData(shFinanceDto, list, 34, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
- paddingData(shFinanceDto, list, 35, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
- paddingData(shFinanceDto, list, 36, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
- paddingData(shFinanceDto, list, 37, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
- paddingData(shFinanceDto, list, 38, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
- paddingData(shFinanceDto, list, 39, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
+ paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+ paddingData(shFinanceDto, list, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+ paddingData(shFinanceDto, list, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+ paddingData(shFinanceDto, list, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+ paddingData(shFinanceDto, list, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+ paddingData(shFinanceDto, list, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
return list;
}
@@ -1012,94 +1080,92 @@
shFinanceDto.setCzbz(api1501.getCzbz());
shFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
- paddingData(shFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(shFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(shFinanceDto, list, 3, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
- paddingData(shFinanceDto, list, 4, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
- paddingData(shFinanceDto, list, 5, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
- paddingData(shFinanceDto, list, 6, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
- paddingData(shFinanceDto, list, 7, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
- paddingData(shFinanceDto, list, 8, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
- paddingData(shFinanceDto, list, 9, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
- paddingData(shFinanceDto, list, 10, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
- paddingData(shFinanceDto, list, 11, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
- paddingData(shFinanceDto, list, 12, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
- paddingData(shFinanceDto, list, 13, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
- paddingData(shFinanceDto, list, 14, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
- paddingData(shFinanceDto, list, 15, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(shFinanceDto, list, 16, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(shFinanceDto, list, 17, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
- paddingData(shFinanceDto, list, 18, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
- paddingData(shFinanceDto, list, 19, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
- paddingData(shFinanceDto, list, 20, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
- paddingData(shFinanceDto, list, 21, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
- paddingData(shFinanceDto, list, 22, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
- paddingData(shFinanceDto, list, 23, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
- paddingData(shFinanceDto, list, 24, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
- paddingData(shFinanceDto, list, 25, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
- paddingData(shFinanceDto, list, 26, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
- paddingData(shFinanceDto, list, 27, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
- paddingData(shFinanceDto, list, 28, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
- paddingData(shFinanceDto, list, 29, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
- paddingData(shFinanceDto, list, 30, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
- paddingData(shFinanceDto, list, 31, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
- paddingData(shFinanceDto, list, 32, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
- paddingData(shFinanceDto, list, 33, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
- paddingData(shFinanceDto, list, 34, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(shFinanceDto, list, 35, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
- paddingData(shFinanceDto, list, 36, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(shFinanceDto, list, 37, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(shFinanceDto, list, 38, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(shFinanceDto, list, 39, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
- paddingData(shFinanceDto, list, 40, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
- paddingData(shFinanceDto, list, 41, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
- paddingData(shFinanceDto, list, 42, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(shFinanceDto, list, 43, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(shFinanceDto, list, 44, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
- paddingData(shFinanceDto, list, 45, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
- paddingData(shFinanceDto, list, 46, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(shFinanceDto, list, 47, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
- paddingData(shFinanceDto, list, 48, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
- paddingData(shFinanceDto, list, 49, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
- paddingData(shFinanceDto, list, 50, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
- paddingData(shFinanceDto, list, 51, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(shFinanceDto, list, 52, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(shFinanceDto, list, 53, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
- paddingData(shFinanceDto, list, 54, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
- paddingData(shFinanceDto, list, 55, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
- paddingData(shFinanceDto, list, 56, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
- paddingData(shFinanceDto, list, 57, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
- paddingData(shFinanceDto, list, 58, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(shFinanceDto, list, 59, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
- paddingData(shFinanceDto, list, 60, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
- paddingData(shFinanceDto, list, 61, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
- paddingData(shFinanceDto, list, 62, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(shFinanceDto, list, 63, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
- paddingData(shFinanceDto, list, 64, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(shFinanceDto, list, 65, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
- paddingData(shFinanceDto, list, 66, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
- paddingData(shFinanceDto, list, 67, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
- paddingData(shFinanceDto, list, 68, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
- paddingData(shFinanceDto, list, 69, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
- paddingData(shFinanceDto, list, 70, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
- paddingData(shFinanceDto, list, 71, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
- paddingData(shFinanceDto, list, 72, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
- paddingData(shFinanceDto, list, 73, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
- paddingData(shFinanceDto, list, 74, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
- paddingData(shFinanceDto, list, 75, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(shFinanceDto, list, 76, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
+ paddingData(shFinanceDto, list, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+ paddingData(shFinanceDto, list, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+ paddingData(shFinanceDto, list, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+ paddingData(shFinanceDto, list, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+ paddingData(shFinanceDto, list, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+ paddingData(shFinanceDto, list, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+ paddingData(shFinanceDto, list, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+ paddingData(shFinanceDto, list, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+ paddingData(shFinanceDto, list, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+ paddingData(shFinanceDto, list, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+ paddingData(shFinanceDto, list, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+ paddingData(shFinanceDto, list, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+ paddingData(shFinanceDto, list, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+ paddingData(shFinanceDto, list, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+ paddingData(shFinanceDto, list, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+ paddingData(shFinanceDto, list, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+ paddingData(shFinanceDto, list, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+ paddingData(shFinanceDto, list, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+ paddingData(shFinanceDto, list, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+ paddingData(shFinanceDto, list, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+ paddingData(shFinanceDto, list, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+ paddingData(shFinanceDto, list, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+ paddingData(shFinanceDto, list, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+ paddingData(shFinanceDto, list, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+ paddingData(shFinanceDto, list, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+ paddingData(shFinanceDto, list, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+ paddingData(shFinanceDto, list, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+ paddingData(shFinanceDto, list, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+ paddingData(shFinanceDto, list, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+ paddingData(shFinanceDto, list, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+ paddingData(shFinanceDto, list, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+ paddingData(shFinanceDto, list, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+ paddingData(shFinanceDto, list, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+ paddingData(shFinanceDto, list, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+ paddingData(shFinanceDto, list, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+ paddingData(shFinanceDto, list, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
return list;
}
private void paddingData(SHFinanceDto common,
List<SHFinanceDto> list,
- Integer zbxh,
String zbmc,
String zbz1,
String zbz2) {
SHFinanceDto shFinanceDto = new SHFinanceDto();
BeanUtils.copyProperties(common, shFinanceDto);
- shFinanceDto.setZbxh(zbxh);
shFinanceDto.setZbmc(zbmc);
shFinanceDto.setZbz1(zbz1);
shFinanceDto.setZbz2(zbz2);
--
Gitblit v1.9.3