From f3e014988da194301c9c8fca2d77a93712c0fce6 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 10 十二月 2024 16:46:29 +0800
Subject: [PATCH] 调整上海接口V3.1
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java | 12 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 320 +++++++++++++++++++++++++++-------------------------
4 files changed, 184 insertions(+), 156 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 01dc743..e80e7d9 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -23,6 +23,7 @@
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.*;
@@ -86,12 +87,12 @@
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
String kqdm = param.getKqdm();
- String xzqhdm= "";
- if(param.getInteId().startsWith("91")){
+ String xzqhdm = "";
+ if (param.getInteId().startsWith("91")) {
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api9110> api9110List = api9110Rep.findPushData(kqdm);
xzqhdm = api9110List.get(0).getXzqhdm();
- }else {
+ } else {
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
xzqhdm = api1102List.get(0).getXzqhdm();
@@ -208,7 +209,8 @@
}
//灏佽鏁版嵁
- SH2023PullReqDto reqData = new SH2023PullReqDto();;
+ SH2023PullReqDto reqData = new SH2023PullReqDto();
+ ;
reqData.setName(conf.getUserName());
reqData.setPwd(conf.getAppCode());
@@ -251,7 +253,7 @@
Object object = getJsonApiData(inteId, data, code);
//闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
- if(!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)){
+ if (!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) {
setZhgxsjValue(object);
}
@@ -348,7 +350,7 @@
BeanUtils.copyProperties(data, api1107);
api1107.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1107.getTykqbm())){
+ if (StringUtils.isEmpty(api1107.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
api1107.setTykqbm(tykqbm);
}
@@ -362,7 +364,7 @@
BeanUtils.copyProperties(data, api1108);
api1108.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1108.getTykqbm())){
+ if (StringUtils.isEmpty(api1108.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
api1108.setTykqbm(tykqbm);
}
@@ -377,7 +379,7 @@
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1109.getTykqbm())){
+ if (StringUtils.isEmpty(api1109.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
api1109.setTykqbm(tykqbm);
}
@@ -399,7 +401,7 @@
BeanUtils.copyProperties(apiData, api1110);
api1110.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1110.getTyajbm())){
+ if (StringUtils.isEmpty(api1110.getTyajbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
api1110.setTyajbm(tyhwbm);
}
@@ -417,7 +419,7 @@
BeanUtils.copyProperties(data, api1111);
api1111.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1111.getTykqbm())){
+ if (StringUtils.isEmpty(api1111.getTykqbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
api1111.setTykqbm(tyhwbm);
}
@@ -433,12 +435,12 @@
api1112.setBjw(ShAreaBjw.getBjw(code));
api1112.setZy("01");
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1112.getTydwbm())){
+ if (StringUtils.isEmpty(api1112.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
api1112.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1112.getTykqbm())){
+ if (StringUtils.isEmpty(api1112.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
api1112.setTykqbm(tykqbm);
}
@@ -452,7 +454,7 @@
BeanUtils.copyProperties(data, api1113);
api1113.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1113.getTydwbm())){
+ if (StringUtils.isEmpty(api1113.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
api1113.setTydwbm(tydwbm);
}
@@ -474,7 +476,7 @@
BeanUtils.copyProperties(data, api1201);
api1201.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1201.getTydwbm())){
+ if (StringUtils.isEmpty(api1201.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
api1201.setTydwbm(tydwbm);
}
@@ -489,14 +491,14 @@
}
//璁剧疆璐攢鏂瑰紡,榛樿瀹㈡埛缁熶竴淇＄敤鐮佷负绌猴紝鍒欎负浜ч攢锛屽弽涔嬩负绔炰环锛�(1-瀹氬悜锛�2-绔炰环锛�3-浜ч攢)
api1201.setGxfs("2");
- if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
+ if (StringUtils.isEmpty(api1201.getKhtyshxydm())) {
api1201.setGxfs("3");
}
//浠樻鏂瑰紡
- if(StringUtils.isEmpty(api1201.getFkfs())){
+ if (StringUtils.isEmpty(api1201.getFkfs())) {
api1201.setFkfs("4");
}
- if(StringUtils.isEmpty(api1201.getYsfs())){
+ if (StringUtils.isEmpty(api1201.getYsfs())) {
api1201.setYsfs("鎸夊皝浠撴暟閲忚繘琛岄獙鏀�");
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -509,13 +511,13 @@
BeanUtils.copyProperties(apiData, api1202);
api1202.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1202.getTyhwbm())){
+ 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));
+ if (StringUtils.isEmpty(api1202.getLqgsdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
api1202.setLqgsdwtybm(tydwbm);
}
api1202.setJzrq(apiData.getCmsj());
@@ -528,12 +530,12 @@
//璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
- if(StringUtils.isEmpty(api1202.getShnd())){
+ 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())){
+ if (null != api1403List && api1403List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
api1202.setLhnd(api1403List.get(0).getJhnd());
}
}
@@ -551,17 +553,17 @@
//绮鎬ц川
api1202.setLsxzdm("200");
//鍞伯浜轰俊鎭�
- if(StringUtils.isEmpty(api1202.getSlr())){
+ if (StringUtils.isEmpty(api1202.getSlr())) {
api1202.setSlr("鍞伯浜�");
}
- if(StringUtils.isEmpty(api1202.getSlrdz())){
+ if (StringUtils.isEmpty(api1202.getSlrdz())) {
api1202.setSlrdz("鍞伯浜哄湴鍧�");
}
//鐢熸垚鏂瑰紡
- if(null == api1202.getScfs()){
+ if (null == api1202.getScfs()) {
api1202.setScfs("1");
}
- if(StringUtils.isEmpty(api1202.getSdblyy())){
+ if (StringUtils.isEmpty(api1202.getSdblyy())) {
api1202.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -574,7 +576,7 @@
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1203.getTyhwbm())){
+ if (StringUtils.isEmpty(api1203.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
api1203.setTyhwbm(tyhwbm);
}
@@ -599,7 +601,7 @@
api1203.setZjbh(api1203.getRkjydh());
List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh());
if (null != api1202List && api1202List.size() > 0) {
- if(api1202List.get(0).getYsgj().equals("3")){
+ if (api1202List.get(0).getYsgj().equals("3")) {
api1203.setZjbh(api1202List.get(0).getBizId().substring(2));
}
}
@@ -613,7 +615,7 @@
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1204.getTyhwbm())){
+ if (StringUtils.isEmpty(api1204.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
api1204.setTyhwbm(tyhwbm);
}
@@ -645,7 +647,7 @@
BeanUtils.copyProperties(apiData, api1205);
api1205.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1205.getTyhwbm())){
+ if (StringUtils.isEmpty(api1205.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
api1205.setTyhwbm(tyhwbm);
}
@@ -660,12 +662,12 @@
//璁剧疆绮杞崲骞村害
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
- if(StringUtils.isEmpty(api1205.getShnd())){
+ 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())){
+ if (null != api1403List && api1403List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
api1205.setLhnd(api1403List.get(0).getJhnd());
}
}
@@ -682,10 +684,10 @@
api1205.setZjbgdh(api1310List.get(0).getZjbgdh());
}
//鐢熸垚鏂瑰紡
- if(null == api1205.getScfs()){
+ if (null == api1205.getScfs()) {
api1205.setScfs("1");
}
- if(StringUtils.isEmpty(api1205.getSdblyy())){
+ if (StringUtils.isEmpty(api1205.getSdblyy())) {
api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -698,7 +700,7 @@
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1206.getTykqbm())){
+ if (StringUtils.isEmpty(api1206.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
api1206.setTykqbm(tykqbm);
}
@@ -731,12 +733,12 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1207.getDcdwtybm())){
+ if (StringUtils.isEmpty(api1207.getDcdwtybm())) {
String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
api1207.setDcdwtybm(dckqtybm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1207.getDchwtybm())){
+ if (StringUtils.isEmpty(api1207.getDchwtybm())) {
String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
api1207.setDchwtybm(dchwtybm);
}
@@ -758,12 +760,12 @@
api1208.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1208.getZglktybm())){
+ if (StringUtils.isEmpty(api1208.getZglktybm())) {
String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
api1208.setZglktybm(lqgstydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ if (StringUtils.isEmpty(api1208.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
api1208.setTyhwbm(tyhwbm);
}
@@ -773,12 +775,15 @@
api1208.setCd(api1208.getHwdm().substring(2, 8));
}
//鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
- if(null == apiData.getBclbs()){
- apiData.setBclbs(0);
+ if (null == apiData.getBclbs()) {
+ api1208.setBclbs(0);
}
- if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
- apiData.setBclbs((int)(apiData.getSjsl()/25));
+ if ("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0) {
+ api1208.setBclbs((int) (apiData.getSjsl() / 25));
+ api1208.setCplgg(25);
+ api1208.setCplbs(api1208.getBclbs());
}
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1208);
return api1208;
@@ -797,9 +802,10 @@
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
+ api1209.setLspzdm(api1208List.get(0).getLspzdm());
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1209.getTyhwbm())){
+ if (StringUtils.isEmpty(api1209.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
api1209.setTyhwbm(tyhwbm);
}
@@ -807,13 +813,13 @@
api1209.setLsxzdm("122");
//鎹熺泭鐜妭锛岄粯璁ゅ嚭搴撴崯鑰�
- if(StringUtils.isEmpty(api1209.getSyhj())){
+ if (StringUtils.isEmpty(api1209.getSyhj())) {
api1209.setSyhj("2");
}
//鑾峰彇涓婃捣瑙勮寖鎹熺泭绫诲瀷
api1209.setSylx(getShSylxByGb(api1209.getSylx()));
//鍏ュ簱鏁伴噺
- if(api1209.getRksl() < api1209.getRkjz()){
+ if (api1209.getRksl() < api1209.getRkjz()) {
api1209.setRksl(api1209.getRkjz());
}
api1209.setCqqrbs(apiData.getCqqrbs() + "");
@@ -829,7 +835,7 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1210.getTyhwbm())){
+ if (StringUtils.isEmpty(api1210.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
api1210.setTyhwbm(tyhwbm);
}
@@ -839,15 +845,15 @@
}
//鑻ヨ鍒掓槑缁嗗彿涓虹┖锛岃缃鍒掓槑缁嗗彿锛屾牴鎹垝杞�ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿
- if(StringUtils.isEmpty(api1210.getJhmxdh())){
- if("200".equals(api1210.getHzqlsxzdm())){
+ 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())){
+ if ("200".equals(api1210.getHzhlsxzdm())) {
//鑻ュ垝杞悗鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍑哄簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
if (null != api1205List && api1205List.size() > 0) {
@@ -868,7 +874,7 @@
api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1211.getTyhwbm())){
+ if (StringUtils.isEmpty(api1211.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
api1211.setTyhwbm(tyhwbm);
}
@@ -880,12 +886,16 @@
//涓荤绮簱浠ｇ爜
api1211.setZglkdm(apiData.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1211.getZglktybm())){
+ if (StringUtils.isEmpty(api1211.getZglktybm())) {
String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
api1211.setZglktybm(zglktybm);
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
+ api1211.setYwksrq(api1211.getYwrq());
+ if ("0".equals(api1211.getYjbz())) {
+ api1211.setYwksrq(DateUtil.getMonthFirst(api1211.getYwrq()));
+ }
return api1211;
}
if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
@@ -893,12 +903,12 @@
BeanUtils.copyProperties(data, api1212);
api1212.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1212.getTydwbm())){
+ if (StringUtils.isEmpty(api1212.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
api1212.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1212.getTykqbm())){
+ if (StringUtils.isEmpty(api1212.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
api1212.setTykqbm(tykqbm);
}
@@ -925,7 +935,7 @@
BeanUtils.copyProperties(data, api1301);
api1301.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1301.getTykqbm())){
+ if (StringUtils.isEmpty(api1301.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
api1301.setTykqbm(tykqbm);
}
@@ -939,7 +949,7 @@
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1302.getTyhwbm())){
+ if (StringUtils.isEmpty(api1302.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
api1302.setTyhwbm(tyhwbm);
}
@@ -962,7 +972,7 @@
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1303.getTyhwbm())){
+ if (StringUtils.isEmpty(api1303.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
api1303.setTyhwbm(tyhwbm);
}
@@ -980,7 +990,7 @@
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1304.getTyhwbm())){
+ if (StringUtils.isEmpty(api1304.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
api1304.setTyhwbm(tyhwbm);
}
@@ -1000,7 +1010,7 @@
api1305.setBjw(ShAreaBjw.getBjw(code));
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1305.getTyajbm())){
+ if (StringUtils.isEmpty(api1305.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
api1305.setTyajbm(tyajbm);
}
@@ -1021,7 +1031,7 @@
api1306.setBjw(ShAreaBjw.getBjw(code));
api1306.setAjdm(apiData.getHwdm().substring(0, 28));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1306.getTyajbm())){
+ if (StringUtils.isEmpty(api1306.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
api1306.setTyajbm(tyajbm);
}
@@ -1046,17 +1056,17 @@
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1307.getTykqbm())){
+ if (StringUtils.isEmpty(api1307.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
api1307.setTykqbm(tykqbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1307.getTyajbm())){
+ if (StringUtils.isEmpty(api1307.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
api1307.setTyajbm(tyajbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1307.getTyhwbm())){
+ if (StringUtils.isEmpty(api1307.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
api1307.setTyhwbm(tyhwbm);
}
@@ -1071,12 +1081,12 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1308.getTykqbm())){
+ if (StringUtils.isEmpty(api1308.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
api1308.setTykqbm(tykqbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1308.getTyhwbm())){
+ if (StringUtils.isEmpty(api1308.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
api1308.setTyhwbm(tyhwbm);
}
@@ -1089,7 +1099,7 @@
BeanUtils.copyProperties(data, api1309);
api1309.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1309.getTykqbm())){
+ if (StringUtils.isEmpty(api1309.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
api1309.setTykqbm(tykqbm);
}
@@ -1104,7 +1114,7 @@
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1310.getTyhwbm())){
+ if (StringUtils.isEmpty(api1310.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
api1310.setTyhwbm(tyhwbm);
}
@@ -1151,7 +1161,7 @@
BeanUtils.copyProperties(data, api1311);
api1311.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1311.getTykqbm())){
+ if (StringUtils.isEmpty(api1311.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
api1311.setTykqbm(tykqbm);
}
@@ -1164,7 +1174,7 @@
BeanUtils.copyProperties(data, api1401);
api1401.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1401.getTydwbm())){
+ if (StringUtils.isEmpty(api1401.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
api1401.setTydwbm(tydwbm);
}
@@ -1191,19 +1201,19 @@
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1403.getTydwbm())){
+ 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; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
- if(null != list && list.size() > 0){
+ if (null != list && list.size() > 0) {
for (Api1404 api1404 : list) {
- if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){
+ if (null != api1404.getLhlx() && "2".equals(api1404.getLhlx())) {
lrsl += api1404.getLhsl();
}
- if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){
+ if (null != api1404.getLhlx() && "1".equals(api1404.getLhlx())) {
lcsl += api1404.getLhsl();
}
}
@@ -1221,7 +1231,7 @@
api1404.setMxzt("1");
api1404.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1404.getTyhwbm())){
+ if (StringUtils.isEmpty(api1404.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
api1404.setTyhwbm(tyhwbm);
}
@@ -1242,12 +1252,12 @@
apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getDrdwtybm())){
+ if (StringUtils.isEmpty(apiData.getDrdwtybm())) {
String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrdwtybm(drkqtybm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getDrhwtybm())){
+ if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
apiData.setDrhwtybm(drhwtybm);
}
@@ -1260,7 +1270,7 @@
SH2023Api2103 apiData = new SH2023Api2103();
BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -1285,64 +1295,64 @@
return data;
}
if (Constant.API_CODE_1504.equals(inteId)) {
- Api1504 api1504 = (Api1504)data;
+ Api1504 api1504 = (Api1504) data;
SH2023Api1504 apiData = new SH2023Api1504();
BeanUtils.copyProperties(api1504, apiData);
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
- Api1505 api1505 = (Api1505)data;
+ Api1505 api1505 = (Api1505) data;
SH2023Api1505 apiData = new SH2023Api1505();
BeanUtils.copyProperties(api1505, apiData);
- apiData.setCqunit(api1505.getCqunit() +"");
- apiData.setCyear(api1505.getCyear() +"");
- apiData.setCdc(api1505.getCdc() +"");
- apiData.setBl(api1505.getBl() +"");
- apiData.setNgrade(api1505.getNgrade() +"");
- apiData.setBq(api1505.getBq() +"");
- apiData.setCqunit(api1505.getCqunit() +"");
- apiData.setBcash(api1505.getBcash() +"");
- apiData.setBbank(api1505.getBbank() +"");
- apiData.setBxjll(api1505.getBxjll() +"");
- apiData.setBf(api1505.getBf() +"");
+ apiData.setCqunit(api1505.getCqunit() + "");
+ apiData.setCyear(api1505.getCyear() + "");
+ apiData.setCdc(api1505.getCdc() + "");
+ apiData.setBl(api1505.getBl() + "");
+ apiData.setNgrade(api1505.getNgrade() + "");
+ apiData.setBq(api1505.getBq() + "");
+ apiData.setCqunit(api1505.getCqunit() + "");
+ apiData.setBcash(api1505.getBcash() + "");
+ apiData.setBbank(api1505.getBbank() + "");
+ apiData.setBxjll(api1505.getBxjll() + "");
+ apiData.setBf(api1505.getBf() + "");
return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
- Api1506 api1506 = (Api1506)data;
+ Api1506 api1506 = (Api1506) data;
SH2023Api1506 apiData = new SH2023Api1506();
BeanUtils.copyProperties(api1506, apiData);
- apiData.setCyear(api1506.getCyear() +"");
- apiData.setNno(api1506.getNno() +"");
- apiData.setCdc(api1506.getCdc() +"");
+ apiData.setCyear(api1506.getCyear() + "");
+ apiData.setNno(api1506.getNno() + "");
+ apiData.setCdc(api1506.getCdc() + "");
return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
- Api1507 api1507 = (Api1507)data;
+ Api1507 api1507 = (Api1507) data;
SH2023Api1507 apiData = new SH2023Api1507();
BeanUtils.copyProperties(api1507, apiData);
- apiData.setCmon(api1507.getCmon() +"");
- apiData.setCyear(api1507.getCyear() +"");
- apiData.setNvno(api1507.getNvno() +"");
- apiData.setNno(api1507.getNno() +"");
- apiData.setCdc(api1507.getCdc() +"");
- apiData.setBpt(api1507.getBpt() +"");
- apiData.setNanum(api1507.getNanum() +"");
- apiData.setBtmp(api1507.getBtmp() +"");
+ apiData.setCmon(api1507.getCmon() + "");
+ apiData.setCyear(api1507.getCyear() + "");
+ apiData.setNvno(api1507.getNvno() + "");
+ apiData.setNno(api1507.getNno() + "");
+ apiData.setCdc(api1507.getCdc() + "");
+ apiData.setBpt(api1507.getBpt() + "");
+ apiData.setNanum(api1507.getNanum() + "");
+ apiData.setBtmp(api1507.getBtmp() + "");
return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
- Api1508 api1508 = (Api1508)data;
+ Api1508 api1508 = (Api1508) data;
SH2023Api1508 apiData = new SH2023Api1508();
BeanUtils.copyProperties(api1508, apiData);
- apiData.setCmon(api1508.getCmon() +"");
- apiData.setCyear(api1508.getCyear() +"");
- apiData.setNvno(api1508.getNvno() +"");
- apiData.setNrowno(api1508.getNrowno() +"");
- apiData.setCdc(api1508.getCdc() +"");
+ apiData.setCmon(api1508.getCmon() + "");
+ apiData.setCyear(api1508.getCyear() + "");
+ apiData.setNvno(api1508.getNvno() + "");
+ apiData.setNrowno(api1508.getNrowno() + "");
+ apiData.setCdc(api1508.getCdc() + "");
return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
- Api1509 api1509 = (Api1509)data;
+ Api1509 api1509 = (Api1509) data;
SH2023Api1509 apiData = new SH2023Api1509();
BeanUtils.copyProperties(api1509, apiData);
apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
@@ -1351,7 +1361,7 @@
return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
- Api1510 api1510 = (Api1510)data;
+ Api1510 api1510 = (Api1510) data;
SH2023Api1510 apiData = new SH2023Api1510();
BeanUtils.copyProperties(api1510, apiData);
apiData.setPeriod(api1510.getPeriod() + "");
@@ -1365,6 +1375,7 @@
/**
* 璧嬪�兼渶鍚庢洿鏂版椂闂�
+ *
* @param object
* @return
*/
@@ -1412,7 +1423,7 @@
map.put(ceng, new ArrayList<>());
}
map.get(ceng).add(Double.valueOf(grain[0]));
- lwmx += grain[2] + ":" + grain[3] +":" + grain[1] + "$" + grain[0];
+ lwmx += grain[2] + ":" + grain[3] + ":" + grain[1] + "$" + grain[0];
if (Double.valueOf(grain[0]) <= -100) {
lwmx += "$" + "1" + "#";
errorNum++;
@@ -1442,7 +1453,7 @@
tempL = null;
tempA = 0.0;
for (Double point : payPoints) {
- if(point > -100){
+ if (point > -100) {
sum += point;
num++;
if (tempH == null) {
@@ -1524,12 +1535,12 @@
shFinanceDto.setDwdm(api1503.getDwdm());
shFinanceDto.setKqdm(api1503.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
shFinanceDto.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
shFinanceDto.setTykqbm(tykqbm);
}
@@ -1538,16 +1549,16 @@
shFinanceDto.setCzbz(api1503.getCzbz());
shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- 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, "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() + "");
@@ -1585,12 +1596,12 @@
shFinanceDto.setDwdm(api1502.getDwdm());
shFinanceDto.setKqdm(api1502.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
shFinanceDto.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
shFinanceDto.setTykqbm(tykqbm);
}
@@ -1599,16 +1610,16 @@
shFinanceDto.setCzbz(api1502.getCzbz());
shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- 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, "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() + "");
@@ -1648,12 +1659,12 @@
shFinanceDto.setDwdm(api1501.getDwdm());
shFinanceDto.setKqdm(api1501.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
shFinanceDto.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
shFinanceDto.setTykqbm(tykqbm);
}
@@ -1662,16 +1673,16 @@
shFinanceDto.setCzbz(api1501.getCzbz());
shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- 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, "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() + "");
@@ -1762,6 +1773,7 @@
}
return wjmc;
}
+
private String getYwdh(String wjlx, String wjmc, String ywdh) {
String[] s = wjmc.split("_");
if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
@@ -1799,11 +1811,11 @@
return object;
}
- private String getShSylxByGb(String gbSylx){
- if("1".equals(gbSylx)){
+ private String getShSylxByGb(String gbSylx) {
+ if ("1".equals(gbSylx)) {
return "2";
}
- if("2".equals(gbSylx)){
+ if ("2".equals(gbSylx)) {
return "1";
}
return gbSylx;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
index f62567b..7f0310a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
@@ -114,7 +114,17 @@
private String bjw;
@PropertyDef(label = "鎴愬搧绮鏍�")
- private String cplgg = "3";
+ private Integer cplgg = 0;
+
+ @PropertyDef(label = "鎴愬搧绮寘鏁�")
+ private Integer cplbs = 0;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ private Date scrq;
+
+ @PropertyDef(label = "淇濊川鏈�")
+ private String bzq;
@PropertyDef(label = "鏉ョ伯浠ｇ爜")
private String goodscode = "鏃�";
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
index 34842a3..663ac34 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -138,5 +138,7 @@
@PropertyDef(label = "绮鎬ц川浠ｇ爜")
private String lsxzdm;
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
index a9a5164..8f85f0c 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
@@ -58,7 +58,11 @@
@PropertyDef(label = "鏈堢粨鏍囧織")
private Integer yjbz;
- @PropertyDef(label = "涓氬姟鏃ユ湡")
+ @PropertyDef(label = "涓氬姟寮�濮嬫棩鏈�")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date ywksrq;
+
+ @PropertyDef(label = "涓氬姟鎴鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
private Date ywrq;
--
Gitblit v1.9.3