From f55b2623f09b0b902f991c701c67a2a6f2577057 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 23 四月 2024 11:07:53 +0800
Subject: [PATCH] 调整order指令包结构
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 780 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 544 insertions(+), 236 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 25bdc64..25f783b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -10,12 +10,13 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import com.fzzy.api.utils.NumberUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,15 +48,21 @@
@Autowired
private Api1102Rep api1102Rep;
@Autowired
+ private Api1103Rep api1103Rep;
+ @Autowired
private Api1104Rep api1104Rep;
@Autowired
private Api1208Rep api1208Rep;
+ @Autowired
+ private Api1210Rep api1210Rep;
@Autowired
private Api1109Rep api1109Rep;
@Autowired
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1403Rep api1403Rep;
@Autowired
private Api1404Rep api1404Rep;
@@ -116,8 +123,8 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- OrderData orderData = (OrderData) redisUtil.get(key);
- if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
+ OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
+ if (null == orderCommonData || StringUtils.isEmpty(orderCommonData.getOrderid())) {
log.error("鎸囦护id澶辨晥=" + jsonData);
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
@@ -132,7 +139,7 @@
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(orderData.getOrderid());
+ reqData.setOrderid(orderCommonData.getOrderid());
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
@@ -159,6 +166,61 @@
}
}
+ @Override
+ public ResponseDto pullData(ApiParam param, ApiConfs conf) {
+ String inteId = param.getInteId();
+ String kqdm = param.getKqdm();
+
+ try {
+ if (null == conf) {
+ conf = apiCommonService.getConf(kqdm);
+ }
+
+ //娣诲姞鏃ュ織
+ ApiLog apiLog = new ApiLog();
+ apiLog.setId(ContextUtil.getUUID());
+ apiLog.setInteId(inteId);
+
+ if (StringUtils.isEmpty(inteId)) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ if (conf == null) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ //灏佽鏁版嵁
+ SH2023PullReqDto reqData = new SH2023PullReqDto();;
+
+ reqData.setName(conf.getUserName());
+ reqData.setPwd(conf.getAppCode());
+ log.info("鎷夊彇鍏变韩鏁版嵁璇锋眰淇℃伅=" + JSON.toJSONString(reqData));
+
+ String url = conf.getApiUrl().replace("UPLOAD", "Shared");
+ SH2023PullRespDto responseDto = SH2023HttpClientUtil.postPullData(url + inteId, JSON.toJSONString(reqData));
+
+ apiLog.setStatus(responseDto.getRetcode() == 200 ? 0 : responseDto.getRetcode());
+ apiLog.setResult(responseDto.getRetMsg());
+ apiLogRep.save(apiLog);
+ ResponseDto resd = new ResponseDto();
+ resd.setSuccess(responseDto.getRetcode() == 200 ? 0 : responseDto.getRetcode());
+ resd.setMsg(responseDto.getRetMsg());
+ resd.setData(responseDto.getData());
+ return resd;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return new ResponseDto(99, e.getMessage());
+ }
+ }
+
/**
* 杞负JSON
*
@@ -177,10 +239,15 @@
} else {
List<Object> list = new ArrayList<>();
Object object = getJsonApiData(inteId, data, code);
+
+ //闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+ if(!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)){
+ setZhgxsjValue(object);
+ }
+
list.add(object);
return JSON.toJSONString(list);
}
-
}
/**
@@ -192,7 +259,6 @@
* @return
*/
private Object getJsonApiData(String inteId, Object data, String code) {
- List<Object> list = new ArrayList<>();
//鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
SH2023Api1101 api1101 = new SH2023Api1101();
@@ -221,9 +287,30 @@
if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
SH2023Api1104 api1104 = new SH2023Api1104();
Api1104 apiData = (Api1104) data;
+
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> api1103List = api1103Rep.findPushDataByCfdm(apiData.getCfbh());
+ List<Api1104> api1104List = api1104Rep.findDataByCfbh(apiData.getCfbh());
+ int num = 2;
+ if (null != api1104List && api1104List.size() > 0) {
+ num = api1104List.size();
+ }
+ if (null != api1103List && api1103List.size() > 0) {
+ Api1103 api1103 = api1103List.get(0);
+ BeanUtils.copyProperties(api1103, api1104);
+ api1104.setCwc(api1103.getCwc() / num);
+ api1104.setCnc(api1103.getCnc() / num);
+ api1104.setSjcr(api1103.getSjcr() / num);
+ }
BeanUtils.copyProperties(apiData, api1104);
api1104.setAjdm(apiData.getAjdh());
api1104.setCfdm(apiData.getCfbh());
+
+ //璁剧疆绮鎬ц川浠ｇ爜(鏌ョ湅寤掗棿瀵瑰簲鐨勬渶鏂板簱瀛樿繘琛岃祴鍊�)
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1104.getAjdm() + "01");
+ if (null != api1208List && api1208List.size() > 0) {
+ api1104.setLsxzdm(api1208List.get(0).getLsxzdm());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1104);
@@ -275,6 +362,8 @@
api1109.setWjl(JSON.toJSONString(map));
//涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
+ //涓氬姟绫诲瀷
+ api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc(), api1109.getYwdh()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -306,6 +395,7 @@
BeanUtils.copyProperties(data, api1112);
api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
+ api1112.setZy("01");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1112);
@@ -333,6 +423,11 @@
if (StringUtils.isEmpty(api1201.getShr())) {
api1201.setShr("瀹℃壒浜�");
}
+ //璁剧疆璐攢鏂瑰紡,榛樿瀹㈡埛缁熶竴淇＄敤鐮佷负绌猴紝鍒欎负浜ч攢锛屽弽涔嬩负绔炰环锛�(1-瀹氬悜锛�2-绔炰环锛�3-浜ч攢)
+ api1201.setGxfs("2");
+ if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
+ api1201.setGxfs("3");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1201);
return api1201;
@@ -349,18 +444,32 @@
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
}
-
- //璁剧疆绮杞崲骞村害
+ //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
- if(null != api1404List && api1404List.size() >0){
- api1202.setLhnd(api1404List.get(0).getShnd());
+ if (null != api1404List && api1404List.size() > 0) {
+ if(StringUtils.isEmpty(api1202.getShnd())){
+ api1202.setShnd(api1404List.get(0).getShnd());
+ }
+ List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
+ if(null != api1403List && api1403List.size() > 0){
+ if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
+ api1202.setLhnd(api1403List.get(0).getJhnd());
+ }
+ }
}
-
+ //鏌ヨ绮鎬ц川杞彉鍗曞彿(鏍规嵁鍏ュ簱鏃堕棿鍜岃揣浣嶄唬鐮佹煡璇㈢伯椋熸�ц川杞彉鍗�)
+ List<Api1210> api1210List = api1210Rep.findDataByHwdmAndTime(api1202.getHwdm(), api1202.getCmsj());
+ if (null != api1210List && api1210List.size() > 0) {
+ api1202.setLsxzzbdh(api1210List.get(0).getLsxzzbdh());
+ }
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川
+ api1202.setLsxzdm("200");
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -384,10 +493,17 @@
}
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1203.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //璁剧疆璐ㄦ缂栫爜(榛樿绛夊悓浜庡叆搴撹川妫�鍗曞彿),鑻ヤ负鑸硅繍锛屽垯璁剧疆涓虹郴缁熷唴鑸硅繍鐨勫崟鍙�
+ api1203.setZjbh(api1203.getRkjydh());
+ List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh());
+ if (null != api1202List && api1202List.size() > 0) {
+ if(api1202List.get(0).getYsgj().equals("3")){
+ api1203.setZjbh(api1202List.get(0).getBizId().substring(2));
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -399,13 +515,19 @@
api1204.setBjw(ShAreaBjw.getBjw(code));
//璁剧疆鎵规鍙�
- if(StringUtils.isNotEmpty(api1204.getHth())){
+ if (StringUtils.isNotEmpty(api1204.getHth())) {
List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
- if(null != api1202List && api1202List.size() > 0){
+ if (null != api1202List && api1202List.size() > 0) {
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202List.get(0).getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
}
+ }
+ }
+ if (StringUtils.isNotEmpty(api1204.getHwdm())) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1204.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
}
}
@@ -430,13 +552,21 @@
//璁剧疆绮杞崲骞村害
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
- if(null != api1404List && api1404List.size() >0){
- api1205.setLhnd(api1404List.get(0).getShnd());
+ if (null != api1404List && api1404List.size() > 0) {
+ if(StringUtils.isEmpty(api1205.getShnd())){
+ api1205.setShnd(api1404List.get(0).getShnd());
+ }
+ List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
+ if(null != api1403List && api1403List.size() > 0){
+ if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
+ api1205.setLhnd(api1403List.get(0).getJhnd());
+ }
+ }
}
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -450,16 +580,21 @@
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
//鎵规鍙�
- if(StringUtils.isNotEmpty(api1206.getHth())){
+ if (StringUtils.isNotEmpty(api1206.getHth())) {
List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
- if(null != api1205List && api1205List.size() > 0){
+ if (null != api1205List && api1205List.size() > 0) {
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205List.get(0).getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
}
}
}
-
+ if (StringUtils.isNotEmpty(apiData.getHwdm())) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
return api1206;
@@ -474,7 +609,7 @@
api1207.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1207.setPch(api1207.getDchwdm() + api1208List.get(0).getShnd());
}
@@ -494,6 +629,13 @@
if (StringUtils.isEmpty(api1208.getCd())) {
api1208.setCd(api1208.getHwdm().substring(2, 8));
}
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if(null == apiData.getBclbs()){
+ apiData.setBclbs(0);
+ }
+ if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
+ apiData.setBclbs((int)(apiData.getSjsl()/25));
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1208);
return api1208;
@@ -510,9 +652,12 @@
api1209.setBjw(ShAreaBjw.getBjw(code));
api1209.setJzrq(apiData.getYwrq());
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
+
+ //绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
+ api1209.setLsxzdm("122");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
@@ -525,8 +670,26 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+
+ //鑻ヨ鍒掓槑缁嗗彿涓虹┖锛岃缃鍒掓槑缁嗗彿锛屾牴鎹垝杞�ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿
+ if(StringUtils.isEmpty(api1210.getJhmxdh())){
+ if("200".equals(api1210.getHzqlsxzdm())){
+ //鑻ュ垝杞墠鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍏ュ簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
+ List<Api1202> api1202List = api1202Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
+ if (null != api1202List && api1202List.size() > 0) {
+ api1210.setJhmxdh(api1202List.get(0).getJhmxh());
+ }
+ }
+ if("200".equals(api1210.getHzhlsxzdm())){
+ //鑻ュ垝杞悗鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍑哄簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
+ List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
+ if (null != api1205List && api1205List.size() > 0) {
+ api1210.setJhmxdh(api1205List.get(0).getJhmxh());
+ }
+ }
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -542,10 +705,11 @@
api1211.setBjw(ShAreaBjw.getBjw(code));
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //涓荤绮簱浠ｇ爜
+ api1211.setZglkdm(apiData.getKqdm());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
return api1211;
@@ -573,16 +737,14 @@
Api1302 apiData = (Api1302) data;
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
- 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());
-
+ api1302.setLqjs("1");
+ //鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1302.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //缁熻灞傞珮銆佸眰浣庛�佸眰鍧囨俯绛変俊鎭�
+ api1302 = packageData1302(api1302);
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1302);
@@ -594,7 +756,7 @@
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -607,7 +769,7 @@
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -636,10 +798,14 @@
Api1306 apiData = (Api1306) data;
BeanUtils.copyProperties(apiData, api1306);
api1306.setBjw(ShAreaBjw.getBjw(code));
- api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
api1306.setAjdm(apiData.getHwdm().substring(0, 28));
//涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1306.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
if (StringUtils.isEmpty(api1306.getSyff())) {
api1306.setSyff("0"); //娼В娉�
}
@@ -692,9 +858,9 @@
}
String lsxzdm = "122";
String pch = "";
- List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
- if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1310.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())) {
lsxzdm = api1208List.get(0).getLsxzdm();
pch = apiData.getHwdm() + api1208List.get(0).getShnd();
}
@@ -702,17 +868,20 @@
//璁剧疆鎵规鍙�
api1310.setPch(pch);
api1310.setLsxzdm(lsxzdm);
- if (api1310.getYpsl() == 0.0){
+ if (api1310.getYpsl() == 0.0) {
api1310.setYpsl(5.0);
}
- if(StringUtils.isEmpty(api1310.getQyrxm())){
+ if (StringUtils.isEmpty(api1310.getQyrxm())) {
api1310.setQyrxm("鎵︽牱浜�");
}
- if(StringUtils.isEmpty(api1310.getJdrxm())){
+ if (StringUtils.isEmpty(api1310.getJdrxm())) {
api1310.setJdrxm("鐩戠潱浜�");
}
- if(StringUtils.isEmpty(api1310.getShrxm())){
+ if (StringUtils.isEmpty(api1310.getShrxm())) {
api1310.setShrxm("瀹℃牳浜�");
+ }
+ if (StringUtils.isEmpty(api1310.getBglx())) {
+ api1310.setBglx("1");
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -756,6 +925,22 @@
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
+ //鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
+ List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
+ if(null != list && list.size() > 0){
+ for (Api1404 api1404 : list) {
+ if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){
+ lrsl += api1404.getLhsl();
+ }
+ if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){
+ lcsl += api1404.getLhsl();
+ }
+ }
+ }
+ api1403.setLrsl(lrsl + "");
+ api1403.setLcsl(lcsl + "");
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
return api1403;
@@ -779,7 +964,7 @@
SH2023Api2102 apiData = new SH2023Api2102();
BeanUtils.copyProperties(data, apiData);
List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getDrhwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -814,16 +999,141 @@
return data;
}
- private String getWjmc(String wjlx, String wjmc){
- if("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)){
- if(wjmc.endsWith(".jpg")) {
- wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+ /**
+ * 璧嬪�兼渶鍚庢洿鏂版椂闂�
+ * @param object
+ * @return
+ */
+ private Object setZhgxsjValue(Object object) {
+ // 浣跨敤鍙嶅皠鑾峰彇灞炴�у垪琛� vo涓哄疄浣撳璞″悕
+ try {
+ Field zhgxsj = object.getClass().getDeclaredField("zhgxsj");
+ zhgxsj.setAccessible(true);
+ zhgxsj.set(object, new Date());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return object;
+ }
+
+ /**
+ * 鏍规嵁涓婃捣鏁版嵁鏍煎紡杩涜灏佽
+ * 灞傚潎娓╋細
+ * 灞傞珮娓╋細
+ * 灞備綆娓╋細
+ * 鍚勮寖鍥村潎娓╋細
+ * 绮俯鏄庣粏锛�
+ * 绮俯鐘舵�侊細
+ * 寮傚父鐐逛釜鏁帮細
+ *
+ * @param data
+ * @return
+ */
+ private SH2023Api1302 packageData1302(SH2023Api1302 data) {
+ if (StringUtils.isEmpty(data.getLswdzjh())) {
+ return data;
+ }
+ String lswdzjh = data.getLswdzjh();
+ String[] split = lswdzjh.split("\\|");
+ Map<Integer, List<Double>> map = new HashMap<>();
+ Integer ceng;
+ Integer errorNum = 0; //寮傚父鐐逛釜鏁�
+ String lwmx = ""; //绮俯鏄庣粏
+ String lwzt = "0"; //绮俯鐘舵��
+ String gfwjw = ""; //鍚勮寖鍥村潎娓�
+ for (String s : split) {
+ String[] grain = s.split(",");
+ ceng = Integer.valueOf(grain[1]);
+ if (null == map.get(ceng)) {
+ map.put(ceng, new ArrayList<>());
}
- if(wjmc.endsWith(".png")) {
- wjmc = wjmc.replaceAll(".png", "_00.png");
+ map.get(ceng).add(Double.valueOf(grain[0]));
+ lwmx += grain[2] + ":" + grain[3] +":" + grain[1] + "$" + grain[0];
+ if (Double.valueOf(grain[0]) <= -100) {
+ lwmx += "$" + "1" + "#";
+ errorNum++;
+ } else {
+ lwmx += "$" + "5" + "#";
}
}
- return wjmc;
+ String cpjw = ""; //灞傚钩鍧囨俯
+ String czgw = ""; //灞傛渶楂樻俯
+ String czdw = ""; //灞傛渶浣庢俯
+
+ List<Double> payPoints;
+ Double sum;
+ int num;
+ Double tempH;
+ Double tempL;
+ Double tempA;
+ Double tempValue1 = 0.0; //鑼冨洿鍧囨俯1
+ Double tempValue2 = 0.0; //鑼冨洿鍧囨俯2
+ Double tempValue3 = 0.0; //鑼冨洿鍧囨俯3
+ Integer numValue = 0; //璁＄畻鑼冨洿鍧囨俯
+ for (Integer cengNum : map.keySet()) {
+ payPoints = map.get(cengNum);
+ sum = 0.0;
+ num = 0;
+ tempH = null;
+ tempL = null;
+ tempA = 0.0;
+ for (Double point : payPoints) {
+ if(point > -100){
+ sum += point;
+ num++;
+ if (tempH == null) {
+ tempH = point;
+ }
+ if (tempL == null) {
+ tempL = point;
+ }
+ if (tempH < point) {
+ tempH = point;
+ }
+ if (tempL > point) {
+ tempL = point;
+ }
+ }
+ }
+ if (num > 0) {
+ tempA = sum / num;
+ }
+ cpjw += cengNum + "$" + NumberUtil.keepPrecision(tempA, 1) + "#";
+ czgw += cengNum + "$" + tempH + "#";
+ czdw += cengNum + "$" + tempL + "#";
+ //鑼冨洿鍧囨俯灏佽
+ if (cengNum == 1) {
+ tempValue1 = NumberUtil.keepPrecision(tempA, 1);
+ } else if (cengNum == map.keySet().size()) {
+ tempValue3 = NumberUtil.keepPrecision(tempA, 1);
+ } else {
+ tempValue2 += tempA;
+ numValue++;
+ }
+ }
+
+ if (errorNum > 0) {
+ lwzt = "2";
+ }
+ if (numValue > 0) {
+ tempValue2 = NumberUtil.keepPrecision(tempValue2 / numValue, 1);
+ }
+ gfwjw += tempValue1 + "#";
+ if (map.keySet().size() == 2) {
+ gfwjw += tempValue3 + "#";
+ }
+ if (map.keySet().size() > 3) {
+ gfwjw += tempValue2 + "#" + tempValue3 + "#";
+ }
+ data.setCpjw(cpjw);
+ data.setCzgw(czgw);
+ data.setCzdw(czdw);
+ data.setGfwjw(gfwjw);
+ data.setLwmx(lwmx);
+ data.setLwzt(lwzt);
+ data.setYcdgs(errorNum);
+
+ return data;
}
/**
@@ -844,226 +1154,223 @@
}
}
- /**
- * Object绫诲瀷杞彉涓篖ist
- *
- * @param obj
- * @param clazz
- * @param <T>
- * @return
- */
- public static <T> List<T> castList(Object obj, Class<T> clazz) {
- List<T> result = new ArrayList<T>();
- if (obj instanceof List<?>) {
- for (Object o : (List<?>) obj) {
- result.add(clazz.cast(o));
- }
- return result;
- }
- return null;
- }
-
-
- private List<SHFinanceDto> copyApi1503(Api1503 data) {
- Api1503 api1503 = data;
+ private List<SHFinanceDto> copyApi1503(Api1503 api1503) {
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1503.getDwdm());
shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("03");
shFinanceDto.setCzbz(api1503.getCzbz());
- shFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
- paddingData(shFinanceDto, list, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
- paddingData(shFinanceDto, list, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
- paddingData(shFinanceDto, list, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
- paddingData(shFinanceDto, list, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
- paddingData(shFinanceDto, list, "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
- paddingData(shFinanceDto, list, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
- paddingData(shFinanceDto, list, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
- paddingData(shFinanceDto, list, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
- paddingData(shFinanceDto, list, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
- paddingData(shFinanceDto, list, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
- paddingData(shFinanceDto, list, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
- paddingData(shFinanceDto, list, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
- paddingData(shFinanceDto, list, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
- paddingData(shFinanceDto, list, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
- paddingData(shFinanceDto, list, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
- paddingData(shFinanceDto, list, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
- paddingData(shFinanceDto, list, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
- paddingData(shFinanceDto, list, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
- paddingData(shFinanceDto, list, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
- paddingData(shFinanceDto, list, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
- paddingData(shFinanceDto, list, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
- paddingData(shFinanceDto, list, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
- paddingData(shFinanceDto, list, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
- paddingData(shFinanceDto, list, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
- paddingData(shFinanceDto, list, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
- paddingData(shFinanceDto, list, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
- paddingData(shFinanceDto, list, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
- paddingData(shFinanceDto, list, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
- paddingData(shFinanceDto, list, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(shFinanceDto, list, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(shFinanceDto, list, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
- paddingData(shFinanceDto, list, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
- paddingData(shFinanceDto, list, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
- paddingData(shFinanceDto, list, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
- paddingData(shFinanceDto, list, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
- paddingData(shFinanceDto, list, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
+ paddingData(shFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+ paddingData(shFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+ paddingData(shFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+ paddingData(shFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+ paddingData(shFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+ paddingData(shFinanceDto, list, "5", "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+ paddingData(shFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+ paddingData(shFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+ paddingData(shFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+ paddingData(shFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+ paddingData(shFinanceDto, list, "10", "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+ paddingData(shFinanceDto, list, "11", "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+ paddingData(shFinanceDto, list, "12", "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+ paddingData(shFinanceDto, list, "13", "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "14", "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+ paddingData(shFinanceDto, list, "15", "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+ paddingData(shFinanceDto, list, "16", "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+ paddingData(shFinanceDto, list, "17", "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+ paddingData(shFinanceDto, list, "18", "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+ paddingData(shFinanceDto, list, "19", "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+ paddingData(shFinanceDto, list, "20", "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+ paddingData(shFinanceDto, list, "21", "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+ paddingData(shFinanceDto, list, "22", "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, "23", "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, "24", "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+ paddingData(shFinanceDto, list, "25", "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+ paddingData(shFinanceDto, list, "26", "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+ paddingData(shFinanceDto, list, "27", "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+ paddingData(shFinanceDto, list, "28", "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+ paddingData(shFinanceDto, list, "29", "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "30", "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "31", "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+ paddingData(shFinanceDto, list, "32", "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+ paddingData(shFinanceDto, list, "33", "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+ paddingData(shFinanceDto, list, "34", "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+ paddingData(shFinanceDto, list, "35", "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+ paddingData(shFinanceDto, list, "36", "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
return list;
}
- private List<SHFinanceDto> copyApi1502(Api1502 data) {
- Api1502 api1502 = data;
+ private List<SHFinanceDto> copyApi1502(Api1502 api1502) {
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1502.getDwdm());
shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("02");
shFinanceDto.setCzbz(api1502.getCzbz());
- shFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
- paddingData(shFinanceDto, list, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
- paddingData(shFinanceDto, list, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
- paddingData(shFinanceDto, list, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
- paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
- paddingData(shFinanceDto, list, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
- paddingData(shFinanceDto, list, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
- paddingData(shFinanceDto, list, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
- paddingData(shFinanceDto, list, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
- paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
- paddingData(shFinanceDto, list, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
- paddingData(shFinanceDto, list, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
- paddingData(shFinanceDto, list, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
- paddingData(shFinanceDto, list, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
- paddingData(shFinanceDto, list, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
- paddingData(shFinanceDto, list, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
- paddingData(shFinanceDto, list, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
- paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(shFinanceDto, list, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
- paddingData(shFinanceDto, list, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
- paddingData(shFinanceDto, list, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
- paddingData(shFinanceDto, list, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
- paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
- paddingData(shFinanceDto, list, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
- paddingData(shFinanceDto, list, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
- paddingData(shFinanceDto, list, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
- paddingData(shFinanceDto, list, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
- paddingData(shFinanceDto, list, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
- paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(shFinanceDto, list, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
- paddingData(shFinanceDto, list, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
- paddingData(shFinanceDto, list, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
- paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
- paddingData(shFinanceDto, list, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
- paddingData(shFinanceDto, list, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
- paddingData(shFinanceDto, list, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
- paddingData(shFinanceDto, list, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
- paddingData(shFinanceDto, list, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
- paddingData(shFinanceDto, list, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
+ paddingData(shFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+ paddingData(shFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+ paddingData(shFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+ paddingData(shFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+ paddingData(shFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+ paddingData(shFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+ paddingData(shFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "10", "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "11", "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "12", "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "13", "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "14", "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+ paddingData(shFinanceDto, list, "15", "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "16", "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "17", "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "18", "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "19", "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "20", "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, "21", "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "22", "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "23", "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "24", "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "25", "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "26", "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "27", "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+ paddingData(shFinanceDto, list, "28", "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "29", "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "30", "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, "31", "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+ paddingData(shFinanceDto, list, "32", "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "33", "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "34", "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "35", "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+ paddingData(shFinanceDto, list, "36", "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+ paddingData(shFinanceDto, list, "37", "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+ paddingData(shFinanceDto, list, "38", "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
return list;
}
- private List<SHFinanceDto> copyApi1501(Api1501 data) {
- Api1501 api1501 = data;
+ private List<SHFinanceDto> copyApi1501(Api1501 api1501) {
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1501.getDwdm());
shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("01");
shFinanceDto.setCzbz(api1501.getCzbz());
- shFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- paddingData(shFinanceDto, list, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(shFinanceDto, list, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(shFinanceDto, list, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
- paddingData(shFinanceDto, list, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
- paddingData(shFinanceDto, list, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
- paddingData(shFinanceDto, list, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
- paddingData(shFinanceDto, list, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
- paddingData(shFinanceDto, list, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
- paddingData(shFinanceDto, list, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
- paddingData(shFinanceDto, list, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
- paddingData(shFinanceDto, list, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
- paddingData(shFinanceDto, list, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
- paddingData(shFinanceDto, list, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(shFinanceDto, list, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
- paddingData(shFinanceDto, list, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
- paddingData(shFinanceDto, list, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
- paddingData(shFinanceDto, list, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
- paddingData(shFinanceDto, list, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
- paddingData(shFinanceDto, list, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
- paddingData(shFinanceDto, list, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
- paddingData(shFinanceDto, list, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
- paddingData(shFinanceDto, list, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
- paddingData(shFinanceDto, list, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
- paddingData(shFinanceDto, list, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
- paddingData(shFinanceDto, list, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
- paddingData(shFinanceDto, list, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
- paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(shFinanceDto, list, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
- paddingData(shFinanceDto, list, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(shFinanceDto, list, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(shFinanceDto, list, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(shFinanceDto, list, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
- paddingData(shFinanceDto, list, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
- paddingData(shFinanceDto, list, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
- paddingData(shFinanceDto, list, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(shFinanceDto, list, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(shFinanceDto, list, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
- paddingData(shFinanceDto, list, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
- paddingData(shFinanceDto, list, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
- paddingData(shFinanceDto, list, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
- paddingData(shFinanceDto, list, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
- paddingData(shFinanceDto, list, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(shFinanceDto, list, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
- paddingData(shFinanceDto, list, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
- paddingData(shFinanceDto, list, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
- paddingData(shFinanceDto, list, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
- paddingData(shFinanceDto, list, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
- paddingData(shFinanceDto, list, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(shFinanceDto, list, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
- paddingData(shFinanceDto, list, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
- paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(shFinanceDto, list, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
- paddingData(shFinanceDto, list, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(shFinanceDto, list, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
- paddingData(shFinanceDto, list, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
- paddingData(shFinanceDto, list, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
- paddingData(shFinanceDto, list, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
- paddingData(shFinanceDto, list, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
- paddingData(shFinanceDto, list, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
- paddingData(shFinanceDto, list, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
- paddingData(shFinanceDto, list, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
- paddingData(shFinanceDto, list, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
- paddingData(shFinanceDto, list, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(shFinanceDto, list, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
+ paddingData(shFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+ paddingData(shFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+ paddingData(shFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+ paddingData(shFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+ paddingData(shFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+ paddingData(shFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+ paddingData(shFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+ paddingData(shFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+ paddingData(shFinanceDto, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+ paddingData(shFinanceDto, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+ paddingData(shFinanceDto, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+ paddingData(shFinanceDto, list, "13", "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+ paddingData(shFinanceDto, list, "14", "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "15", "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, "16", "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+ paddingData(shFinanceDto, list, "17", "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+ paddingData(shFinanceDto, list, "18", "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+ paddingData(shFinanceDto, list, "19", "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+ paddingData(shFinanceDto, list, "20", "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+ paddingData(shFinanceDto, list, "21", "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+ paddingData(shFinanceDto, list, "22", "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+ paddingData(shFinanceDto, list, "23", "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+ paddingData(shFinanceDto, list, "24", "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+ paddingData(shFinanceDto, list, "25", "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+ paddingData(shFinanceDto, list, "26", "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+ paddingData(shFinanceDto, list, "27", "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+ paddingData(shFinanceDto, list, "28", "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+ paddingData(shFinanceDto, list, "29", "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+ paddingData(shFinanceDto, list, "30", "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+ paddingData(shFinanceDto, list, "31", "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+ paddingData(shFinanceDto, list, "32", "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+ paddingData(shFinanceDto, list, "33", "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, "34", "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+ paddingData(shFinanceDto, list, "35", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, "36", "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, "37", "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "38", "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+ paddingData(shFinanceDto, list, "39", "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+ paddingData(shFinanceDto, list, "40", "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+ paddingData(shFinanceDto, list, "41", "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, "42", "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, "43", "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+ paddingData(shFinanceDto, list, "44", "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+ paddingData(shFinanceDto, list, "45", "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, "46", "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+ paddingData(shFinanceDto, list, "47", "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+ paddingData(shFinanceDto, list, "48", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+ paddingData(shFinanceDto, list, "49", "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+ paddingData(shFinanceDto, list, "50", "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, "51", "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, "52", "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+ paddingData(shFinanceDto, list, "53", "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+ paddingData(shFinanceDto, list, "54", "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+ paddingData(shFinanceDto, list, "55", "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+ paddingData(shFinanceDto, list, "56", "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+ paddingData(shFinanceDto, list, "57", "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, "58", "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+ paddingData(shFinanceDto, list, "59", "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+ paddingData(shFinanceDto, list, "60", "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+ paddingData(shFinanceDto, list, "61", "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, "62", "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+ paddingData(shFinanceDto, list, "63", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, "64", "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+ paddingData(shFinanceDto, list, "65", "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+ paddingData(shFinanceDto, list, "66", "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+ paddingData(shFinanceDto, list, "67", "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+ paddingData(shFinanceDto, list, "68", "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+ paddingData(shFinanceDto, list, "69", "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+ paddingData(shFinanceDto, list, "70", "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+ paddingData(shFinanceDto, list, "71", "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+ paddingData(shFinanceDto, list, "72", "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+ paddingData(shFinanceDto, list, "73", "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+ paddingData(shFinanceDto, list, "74", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, "75", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
return list;
}
- private void paddingData(SHFinanceDto common, List<SHFinanceDto> list, String zbmc, String zbz1, String zbz2) {
+ private void paddingData(SHFinanceDto common, List<SHFinanceDto> list, String zbxh, String zbmc, String zbz1, String zbz2) {
SHFinanceDto shFinanceDto = new SHFinanceDto();
BeanUtils.copyProperties(common, shFinanceDto);
+ shFinanceDto.setZbxh(zbxh);
shFinanceDto.setZbmc(zbmc);
shFinanceDto.setZbz1(zbz1);
shFinanceDto.setZbz2(zbz2);
list.add(shFinanceDto);
+ }
+
+ private String getWjmc(String wjlx, String wjmc) {
+ if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
+ if (wjmc.endsWith(".jpg")) {
+ wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+ }
+ if (wjmc.endsWith(".png")) {
+ wjmc = wjmc.replaceAll(".png", "_00.png");
+ }
+ }
+ return wjmc;
+ }
+ private String getYwdh(String wjlx, String wjmc, String ywdh) {
+ String[] s = wjmc.split("_");
+ if ("2".equals(wjlx) || "3".equals(wjlx)) {
+ ywdh = s[1];
+ }
+ return ywdh;
}
private Object changeObject(Object object) {
@@ -1094,4 +1401,5 @@
}
return object;
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3