From f646df3f4fa190bb2fac0d9c752880b16c636dd3 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 09 一月 2024 15:41:00 +0800
Subject: [PATCH] 优化上海接口-性质转变加入计划明细单号
---
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 8 ++++++++
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java | 8 ++++++++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 16 ++++++++++++++++
3 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
index f64cdcc..d1c0de7 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -44,4 +44,12 @@
@Query("from Api1202 where rkjsdh=:rkjsdh ")
List<Api1202> getDataByRkjsdh(@Param("rkjsdh") String rkjsdh);
+
+ /**
+ * 鏍规嵁璐т綅浠ｇ爜鍜屼笟鍔℃棩鏈燂紝鍊掑簭鏌ヨ
+ * @param hwdm
+ * @return
+ */
+ @Query("from Api1202 where hwdm=:hwdm and ywrq <=:keyTime order by ywrq desc")
+ List<Api1202> getDataByHwdmAndTime(@Param("hwdm") String hwdm, @Param("keyTime") Date keyTime);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
index 48cdee4..0809515 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
@@ -42,4 +42,12 @@
*/
@Query("from Api1205 where ckjsdh =:ckjsdh")
List<Api1205> getDataByCkjsdh(@Param("ckjsdh") String ckjsdh);
+
+ /**
+ * 鏍规嵁璐т綅浠ｇ爜鍜屼笟鍔℃棩鏈燂紝姝ｅ簭鏌ヨ
+ * @param hwdm
+ * @return
+ */
+ @Query("from Api1205 where hwdm=:hwdm and ywrq >=:keyTime order by ywrq asc ")
+ List<Api1205> getDataByHwdmAndTime(@Param("hwdm") String hwdm, @Param("keyTime") Date keyTime);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 13f08c1..0ad22d7 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -659,6 +659,22 @@
api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //璁剧疆璁″垝鏄庣粏鍙凤紝鏍规嵁鍒掕浆鎬ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿
+ 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());
+ }
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1210);
return api1210;
--
Gitblit v1.9.3