From d772a530c931502bdcf9c0fda5a81698ddc07d70 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 30 十月 2023 20:59:13 +0800
Subject: [PATCH] 优化上海接口-轮换计划上报

---
 src/main/java/com/fzzy/api/view/repository/Api1101Rep.java     |    8 ++++++++
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |    8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/repository/Api1101Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1101Rep.java
index 9aebb28..9bd410b 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1101Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1101Rep.java
@@ -40,4 +40,12 @@
      */
     @Query("from Api1101 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
     List<Api1101> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+    /**
+     * 鍗曚綅淇℃伅
+     * @param dwdm
+     * @return
+     */
+    @Query("from Api1101 where dwdm =:dwdm ")
+    List<Api1101> findDataByDwdm(@Param("dwdm") String dwdm);
 }
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index fde8cea..90f4825 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -43,6 +43,8 @@
     @Autowired
     private ApiLogRep apiLogRep;
     @Autowired
+    private Api1101Rep api1101Rep;
+    @Autowired
     private Api1102Rep api1102Rep;
     @Autowired
     private Api1104Rep api1104Rep;
@@ -706,8 +708,10 @@
             SH2023Api1403 api1403 = new SH2023Api1403();
             Api1403 apiData = (Api1403) data;
             BeanUtils.copyProperties(apiData, api1403);
-            api1403.setJhzxdw(apiData.getJhxddw());
-            api1403.setJhzxdwmc(apiData.getJhxddwmc());
+            List<Api1101> api1101List = api1101Rep.findDataByDwdm(apiData.getLhjhdh().substring(0, 18));
+
+            api1403.setJhzxdw(api1101List.get(0).getDwdm());
+            api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
             api1403.setBjw(ShAreaBjw.getBjw(code));
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�

--
Gitblit v1.9.3