From 7461520ce42bb22f3ef8ee9d97d26bf0e9215d1e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 07 一月 2025 17:18:34 +0800
Subject: [PATCH] 数据调整
---
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index c93a2c7..629b77c 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -11,6 +11,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -25,6 +26,7 @@
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -43,6 +45,8 @@
private ApiCommonService apiCommonService;
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1208Rep api1208Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -246,7 +250,7 @@
BeanUtils.copyProperties(data, apiData);
//璁剧疆绲变竴浠撴埧缂栫爜
if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
apiData.setTycfbm(tycfbm);
}
//璁剧疆绲变竴寤掗棿鍚嶇О
@@ -326,7 +330,7 @@
}
//璁剧疆鏂囦欢娴�
apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
- //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜_
if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
}
@@ -434,6 +438,10 @@
if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
}
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
+ apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ }
return apiData;
}
if (Constant.API_CODE_1203.equals(inteId)) {
@@ -485,6 +493,11 @@
if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
}
+ //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
+ apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
+ }
return apiData;
}
if (Constant.API_CODE_1206.equals(inteId)) {
@@ -509,12 +522,12 @@
BeanUtils.copyProperties(api1207, apiData);
//璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDckqtybm())) {
- String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0, 21));
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
//璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
- String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0, 21));
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
@@ -544,7 +557,7 @@
}
//璁剧疆绮潈鍗曚綅绲变竴缂栫爜
if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
+ String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgstydwbm(tydwbm);
}
return apiData;
@@ -564,6 +577,15 @@
}
//瀹為檯鎹熻�楁暟閲忚祴鍊�
apiData.setSjsysl(api1209.getJzsysl());
+
+ //璁剧疆鍝佺銆佹�ц川銆佺瓑绾с�佸勾搴�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setLspzdm(api1208List.get(0).getLspzdm());
+ apiData.setLsxzdm(api1208List.get(0).getLsxzdm());
+ apiData.setLsdjdm(api1208List.get(0).getLsdjdm());
+ apiData.setShnd(api1208List.get(0).getShnd());
+ }
return apiData;
}
if (Constant.API_CODE_1210.equals(inteId)) {
@@ -844,47 +866,39 @@
Api1504 api1504 = (Api1504)data;
SX2024Api1504 apiData = new SX2024Api1504();
BeanUtils.copyProperties(api1504, apiData);
- //璁剧疆绲变竴鍗曚綅缂栫爜
- if (StringUtils.isEmpty(apiData.getXqydm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
- apiData.setXqydm(tydwbm);
- }
- //璁剧疆绲变竴搴撳尯缂栫爜
- if (StringUtils.isEmpty(apiData.getXkqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
- apiData.setXkqdm(tykqbm);
- }
- return data;
+ return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
+ Api1505 api1505 = (Api1505)data;
SX2024Api1505 apiData = new SX2024Api1505();
- BeanUtils.copyProperties(data, apiData);
- return data;
+ BeanUtils.copyProperties(api1505, apiData);
+ apiData.setCqunit(api1505.getCqunit() + "");
+ return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
SX2024Api1506 apiData = new SX2024Api1506();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
SX2024Api1507 apiData = new SX2024Api1507();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
SX2024Api1508 apiData = new SX2024Api1508();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
SX2024Api1509 apiData = new SX2024Api1509();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
SX2024Api1510 apiData = new SX2024Api1510();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
return data;
}
--
Gitblit v1.9.3