From c1c6ba319ead2d57167391f853626bf77aedfe4a Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 29 一月 2024 15:17:40 +0800
Subject: [PATCH] 优化上海嘉定纪委接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 5 ++++-
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 7 ++++++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 5 ++++-
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 9 +++++++--
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 6d54b86..def2483 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -136,6 +136,9 @@
api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
if(null != api1404List && api1404List.size() > 0){
apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ if(StringUtils.isEmpty(sysData.getFoodYear())){
+ sysData.setFoodYear(api1404List.get(0).getShnd());
+ }
}
}
}
@@ -158,7 +161,7 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
- apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(new Date(), "yyyy") : sysData.getFoodYear());
+ apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") : sysData.getFoodYear());
//浜у湴浠ｇ爜
mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 7b2a534..0975df3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -132,6 +132,9 @@
List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
if(null != api1404List && api1404List.size() > 0){
apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ if(StringUtils.isEmpty(sysData.getFoodYear())){
+ sysData.setFoodYear(api1404List.get(0).getShnd());
+ }
}
}
}
@@ -155,7 +158,7 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
- apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
+ apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") :sysData.getFoodYear());
//浜у湴浠ｇ爜
mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index b6f0cc6..f146029 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -447,7 +447,9 @@
//璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
- api1202.setShnd(api1404List.get(0).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())){
@@ -551,6 +553,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())){
@@ -843,7 +848,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();
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index c40bfac..5307143 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -277,7 +277,9 @@
//璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
- api1202.setShnd(api1404List.get(0).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())) {
@@ -350,6 +352,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())) {
--
Gitblit v1.9.3