From 447c6f6eadd1363a6575cbcbc1298f9d8cefdef2 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 25 十一月 2024 09:53:54 +0800
Subject: [PATCH] 调整-上海对农接口
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 902 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 709 insertions(+), 193 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index f4820d2..6638635 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1,6 +1,7 @@
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;
@@ -10,8 +11,10 @@
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.push.nx2023.NX2023Constant;
import com.fzzy.push.sh2023.dto.*;
+import com.fzzy.push.sx2024.SX2024Constant;
+import com.fzzy.push.sx2024.data.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -20,7 +23,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.lang.reflect.Field;
import java.util.*;
@@ -62,6 +64,8 @@
@Autowired
private Api1205Rep api1205Rep;
@Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
private Api1403Rep api1403Rep;
@Autowired
private Api1404Rep api1404Rep;
@@ -78,7 +82,7 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
+
String kqdm = param.getKqdm();
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
@@ -90,23 +94,18 @@
//娣诲姞鏃ュ織
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);
-
- if (StringUtils.isEmpty(inteId)) {
+ if (StringUtils.isEmpty(param.getInteId())) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
return responseDto;
}
+ apiLog.setInteId(param.getInteId());
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
+ //鑾峰彇JSON鎶ユ枃
String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
@@ -123,8 +122,8 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- OrderData orderData = (OrderData) redisUtil.get(key);
- if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
+ String orderId = (String) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderId)) {
log.error("鎸囦护id澶辨晥=" + jsonData);
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
@@ -139,7 +138,7 @@
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(orderData.getOrderid());
+ reqData.setOrderid(orderId);
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
@@ -239,6 +238,12 @@
} 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);
}
@@ -331,6 +336,11 @@
SH2023Api1107 api1107 = new SH2023Api1107();
BeanUtils.copyProperties(data, api1107);
api1107.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1107.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1107);
@@ -340,6 +350,11 @@
SH2023Api1108 api1108 = new SH2023Api1108();
BeanUtils.copyProperties(data, api1108);
api1108.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1108.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1108);
@@ -350,6 +365,11 @@
Api1109 apiData = (Api1109) data;
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1109.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
@@ -367,6 +387,12 @@
Api1110 apiData = (Api1110) data;
BeanUtils.copyProperties(apiData, api1110);
api1110.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1110.getTyajbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
+ api1110.setTyajbm(tyhwbm);
+ }
+
api1110.setAjdm(apiData.getHwdm().substring(0, 28));
api1110.setAjxdwz(apiData.getHwxdwz());
api1110.setAjwzys(apiData.getHwwzys());
@@ -379,6 +405,11 @@
SH2023Api1111 api1111 = new SH2023Api1111();
BeanUtils.copyProperties(data, api1111);
api1111.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1111.getTykqbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
+ api1111.setTykqbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1111);
@@ -390,6 +421,16 @@
api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
api1112.setZy("01");
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1112.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
+ api1112.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1112.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
+ api1112.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1112);
@@ -399,15 +440,33 @@
SH2023Api1113 api1113 = new SH2023Api1113();
BeanUtils.copyProperties(data, api1113);
api1113.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1113.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
+ api1113.setTydwbm(tydwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1113);
return api1113;
+ }
+ //鏁版嵁鐩哥鎬ф帴鍙�
+ if (SH2023Constant.SH_2023_API_CODE_1115.equals(inteId)) {
+ SH2023Api1115 api1115 = new SH2023Api1115();
+ BeanUtils.copyProperties(data, api1115);
+ api1115.setBjw(ShAreaBjw.getBjw(code));
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ changeObject(api1115);
+ return api1115;
}
if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
SH2023Api1201 api1201 = new SH2023Api1201();
BeanUtils.copyProperties(data, api1201);
api1201.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1201.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
+ api1201.setTydwbm(tydwbm);
+ }
api1201.setHtsfzz("0");
//鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧～鏃�
if (StringUtils.isEmpty(api1201.getQddd())) {
@@ -422,6 +481,13 @@
if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
api1201.setGxfs("3");
}
+ //浠樻鏂瑰紡
+ if(StringUtils.isEmpty(api1201.getFkfs())){
+ api1201.setFkfs("4");
+ }
+ if(StringUtils.isEmpty(api1201.getYsfs())){
+ api1201.setYsfs("鎸夊皝浠撴暟閲忚繘琛岄獙鏀�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1201);
return api1201;
@@ -431,6 +497,16 @@
Api1202 apiData = (Api1202) data;
BeanUtils.copyProperties(apiData, api1202);
api1202.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1202.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
+ api1202.setTyhwbm(tyhwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1202.getLqgsdwtybm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0,18));
+ api1202.setLqgsdwtybm(tydwbm);
+ }
api1202.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1202.getCddm())) {
api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -441,6 +517,9 @@
//璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
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())){
@@ -460,6 +539,13 @@
}
//绮鎬ц川
api1202.setLsxzdm("200");
+ //鍞伯浜轰俊鎭�
+ if(StringUtils.isEmpty(api1202.getSlr())){
+ api1202.setSlr("鍞伯浜�");
+ }
+ if(StringUtils.isEmpty(api1202.getSlrdz())){
+ api1202.setSlrdz("鍞伯浜哄湴鍧�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
@@ -470,6 +556,11 @@
Api1203 apiData = (Api1203) data;
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1203.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
+ api1203.setTyhwbm(tyhwbm);
+ }
if (StringUtils.isEmpty(api1203.getJyxm())) {
api1203.setJyxm("0");
}
@@ -504,7 +595,11 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1204.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
+ api1204.setTyhwbm(tyhwbm);
+ }
//璁剧疆鎵规鍙�
if (StringUtils.isNotEmpty(api1204.getHth())) {
List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
@@ -532,7 +627,11 @@
Api1205 apiData = (Api1205) data;
BeanUtils.copyProperties(apiData, api1205);
api1205.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1205.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
+ api1205.setTyhwbm(tyhwbm);
+ }
api1205.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1205.getCddm())) {
api1205.setCddm(api1205.getHwdm().substring(2, 8));
@@ -544,6 +643,9 @@
//璁剧疆绮杞崲骞村害
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
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())){
@@ -557,9 +659,18 @@
if (null != api1208List && api1208List.size() > 0) {
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
- //绮鎬ц川
- api1205.setLsxzdm("200");
+ //璐ㄦ鍗曞彿
+ List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02");
+ if (null != api1310List && api1310List.size() > 0) {
+ api1205.setZjbgdh(apiData.getHwdm() + api1310List.get(0).getZjbgdh());
+ }
+ //鐢熸垚鏂瑰紡
+ if(null == api1205.getScfs()){
+ api1205.setScfs(1);
+ }
+ if(StringUtils.isEmpty(api1205.getSdblyy())){
+ api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -569,6 +680,11 @@
Api1206 apiData = (Api1206) data;
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1206.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1206.setTykqbm(tykqbm);
+ }
//鎵规鍙�
if (StringUtils.isNotEmpty(api1206.getHth())) {
List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
@@ -577,6 +693,12 @@
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());
}
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -591,6 +713,16 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1207.getDcdwtybm())){
+ String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
+ api1207.setDcdwtybm(dckqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1207.getDchwtybm())){
+ String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
+ api1207.setDchwtybm(dchwtybm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
if (null != api1208List && api1208List.size() > 0) {
@@ -608,10 +740,27 @@
api1208.setZglkdm(api1208.getHwdm().substring(0, 21));
api1208.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getZglktybm())){
+ String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
+ api1208.setZglktybm(lqgstydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ }
//璁剧疆鎵规鍙�
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
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);
@@ -632,10 +781,24 @@
if (null != api1208List && api1208List.size() > 0) {
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1209.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
+ api1209.setTyhwbm(tyhwbm);
+ }
//绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
api1209.setLsxzdm("122");
+ //鎹熺泭鐜妭锛岄粯璁ゅ嚭搴撴崯鑰�
+ if(StringUtils.isEmpty(api1209.getSyhj())){
+ api1209.setSyhj("2");
+ }
+ //鑾峰彇涓婃捣瑙勮寖鎹熺泭绫诲瀷
+ api1209.setSylx(getShSylxByGb(api1209.getSylx()));
+ //鍏ュ簱鏁伴噺
+ if(api1209.getRksl() < api1209.getRkjz()){
+ api1209.setRksl(api1209.getRkjz());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
@@ -646,9 +809,32 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1210.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
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());
+ }
+ }
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -662,6 +848,11 @@
BeanUtils.copyProperties(apiData, api1211);
api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1211.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
+ api1211.setTyhwbm(tyhwbm);
+ }
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
@@ -669,6 +860,11 @@
}
//涓荤绮簱浠ｇ爜
api1211.setZglkdm(apiData.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1211.getZglktybm())){
+ String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
+ api1211.setZglktybm(zglktybm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
return api1211;
@@ -677,16 +873,40 @@
SH2023Api1212 api1212 = new SH2023Api1212();
BeanUtils.copyProperties(data, api1212);
api1212.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1212.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
+ api1212.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1212.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
+ api1212.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1212);
return api1212;
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1213.equals(inteId)) {
+ Api1213 api1213 = (Api1213) data;
+ SH2023Api1213 apiData = new SH2023Api1213();
+ BeanUtils.copyProperties(api1213, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1213.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
}
if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
SH2023Api1301 api1301 = new SH2023Api1301();
BeanUtils.copyProperties(data, api1301);
api1301.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1301.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
+ api1301.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1301);
return api1301;
@@ -696,6 +916,11 @@
Api1302 apiData = (Api1302) data;
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1302.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
+ api1302.setTyhwbm(tyhwbm);
+ }
api1302.setLqjs("1");
//鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
@@ -714,6 +939,11 @@
Api1303 apiData = (Api1303) data;
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1303.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
+ api1303.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -727,6 +957,11 @@
Api1304 apiData = (Api1304) data;
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1304.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
+ api1304.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -742,6 +977,11 @@
BeanUtils.copyProperties(apiData, api1305);
api1305.setBjw(ShAreaBjw.getBjw(code));
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1305.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
+ api1305.setTyajbm(tyajbm);
+ }
//涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
@@ -757,10 +997,19 @@
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));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1306.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
+ api1306.setTyajbm(tyajbm);
+ }
//涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+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"); //娼В娉�
}
@@ -774,7 +1023,21 @@
BeanUtils.copyProperties(apiData, api1307);
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
+ api1307.setTyajbm(tyajbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1307);
return api1307;
@@ -785,7 +1048,16 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
+ api1308.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1308);
return api1308;
@@ -794,6 +1066,11 @@
SH2023Api1309 api1309 = new SH2023Api1309();
BeanUtils.copyProperties(data, api1309);
api1309.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1309.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
+ api1309.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1309);
return api1309;
@@ -804,7 +1081,11 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1310.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -813,7 +1094,7 @@
}
String lsxzdm = "122";
String pch = "";
- List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
+ 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();
@@ -835,6 +1116,9 @@
if (StringUtils.isEmpty(api1310.getShrxm())) {
api1310.setShrxm("瀹℃牳浜�");
}
+ if (StringUtils.isEmpty(api1310.getBglx())) {
+ api1310.setBglx("1");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
@@ -844,7 +1128,11 @@
SH2023Api1311 api1311 = new SH2023Api1311();
BeanUtils.copyProperties(data, api1311);
api1311.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1311.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
+ api1311.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1311);
return api1311;
@@ -853,7 +1141,11 @@
SH2023Api1401 api1401 = new SH2023Api1401();
BeanUtils.copyProperties(data, api1401);
api1401.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1401.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
+ api1401.setTydwbm(tydwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1401);
return api1401;
@@ -876,7 +1168,11 @@
api1403.setJhzxdw(api1101List.get(0).getDwdm());
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1403.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1403.getJhzxdw());
+ api1403.setTydwbm(tydwbm);
+ }
//鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
@@ -890,8 +1186,8 @@
}
}
}
- api1403.setLrsl(lrsl/1000 + "");
- api1403.setLcsl(lcsl/1000 + "");
+ api1403.setLrsl(lrsl + "");
+ api1403.setLcsl(lcsl + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
@@ -902,7 +1198,11 @@
BeanUtils.copyProperties(data, api1404);
api1404.setMxzt("1");
api1404.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1404.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
+ api1404.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1404);
return api1404;
@@ -919,6 +1219,17 @@
if (null != api1208List && api1208List.size() > 0) {
apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
}
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDrdwtybm())){
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+ apiData.setDrdwtybm(drkqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDrhwtybm())){
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -926,6 +1237,11 @@
if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
SH2023Api2103 apiData = new SH2023Api2103();
BeanUtils.copyProperties(data, apiData);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -946,9 +1262,62 @@
changeObject(data);
return data;
}
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ Api1504 api1504 = (Api1504)data;
+ SH2023Api1504 apiData = new SH2023Api1504();
+ BeanUtils.copyProperties(api1504, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ SH2023Api1505 apiData = new SH2023Api1505();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ SH2023Api1506 apiData = new SH2023Api1506();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ SH2023Api1507 apiData = new SH2023Api1507();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ SH2023Api1508 apiData = new SH2023Api1508();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ SH2023Api1509 apiData = new SH2023Api1509();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ SH2023Api1510 apiData = new SH2023Api1510();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(data);
return data;
+ }
+
+ /**
+ * 璧嬪�兼渶鍚庢洿鏂版椂闂�
+ * @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;
}
/**
@@ -1093,48 +1462,59 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1503.getDwdm());
+ shFinanceDto.setKqdm(api1503.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
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;
}
@@ -1143,50 +1523,61 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1502.getDwdm());
+ shFinanceDto.setKqdm(api1502.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
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;
}
@@ -1195,93 +1586,105 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1501.getDwdm());
+ shFinanceDto.setKqdm(api1501.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
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);
@@ -1301,7 +1704,7 @@
}
private String getYwdh(String wjlx, String wjmc, String ywdh) {
String[] s = wjmc.split("_");
- if ("2".equals(wjlx) || "3".equals(wjlx)) {
+ if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
ywdh = s[1];
}
return ywdh;
@@ -1336,4 +1739,117 @@
return object;
}
+ private String getShSylxByGb(String gbSylx){
+ if("1".equals(gbSylx)){
+ return "2";
+ }
+ if("2".equals(gbSylx)){
+ return "1";
+ }
+ return gbSylx;
+ }
+
+ /**
+ * 鏍规嵁鎺ュ彛缂栫爜鑾峰彇瀵瑰簲鐨勬帴鍙ｆ暟鎹簱琛ㄥ悕
+ *
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ //鏁版嵁鐩哥鎬�
+ if (Constant.API_CODE_9101.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1115;
+ }
+ //瑙嗛鐩戞帶鎺ュ彛
+ if (Constant.API_CODE_9102.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1311;
+ }
+ //鍊掍粨鍊掑叆鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9103.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2102;
+ }
+ //绮儏璁惧閰嶇疆鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9104.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2103;
+ }
+ //妫�鏂ゅ崟鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9105.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2101;
+ }
+ //甯傚偍椹宠繍鍗曚俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9106.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2104;
+ }
+ //浜ゆ槗涓績鍚堝悓淇″績鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9107.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2203;
+ }
+ //瀹氬寲姘存楠屾帴鍙�
+ if (Constant.API_CODE_9108.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2204;
+ }
+ //鍗曚綅淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9109.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3101;
+ }
+ //鏀剁撼搴撲俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9110.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3102;
+ }
+ //浠撴埧淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9111.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3103;
+ }
+ //寤掗棿淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9112.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3104;
+ }
+ //璐т綅淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9113.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3105;
+ }
+ //绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9114.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3106;
+ }
+ //鏉ョ伯妫�楠屼俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9115.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3107;
+ }
+ //绮鏀惰喘鍩虹淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9116.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3108;
+ }
+ if (Constant.API_CODE_1501.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1502.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1503.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1116;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1117;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1118;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1119;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1120;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1121;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1122;
+ }
+ return inteId;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3