From 07ff6686da8e9922a6f5a4f276e69d045e12a044 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 15:59:23 +0800
Subject: [PATCH] 调整上海接口:粮食管理相关同步

---
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 8e3f491..3a84775 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -513,6 +513,9 @@
             BeanUtils.copyProperties(apiData, api1305);
             api1305.setBjw(ShAreaBjw.getBjw(code));
             api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+            //涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
+            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+            api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1305);
@@ -524,7 +527,9 @@
             BeanUtils.copyProperties(apiData, api1306);
             api1306.setBjw(ShAreaBjw.getBjw(code));
             api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
-            api1306.setAjdm(apiData.getXzzydh().substring(0, 28));
+            api1306.setAjdm(apiData.getHwdm().substring(0, 28));
+            //涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
+            api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1306);
@@ -572,9 +577,6 @@
             api1310.setBjw(ShAreaBjw.getBjw(code));
             api1310.setJyrq(apiData.getJysj());
             api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
-            List<Api1202> api1202List = api1202Rep.getDataByHwdm(apiData.getHwdm());
-            api1310.setLspzdm(api1202List.get(0).getLspzdm());
-            api1310.setLsxzdm("123");
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1310);
@@ -621,27 +623,40 @@
             return api1404;
         }
         if (SH2023Constant.SH_2023_API_CODE_2101.equals(inteId)) {
+            //璁剧疆绌哄睘鎬т负榛樿鍊�
+            changeObject(data);
             return data;
         }
         if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+            //璁剧疆绌哄睘鎬т负榛樿鍊�
+            changeObject(data);
             return data;
         }
         if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
-            SH2023Api2103 api2103 = new SH2023Api2103();
-            BeanUtils.copyProperties(data, api2103);
-            List<SH2023Api2103Item> listItems = castList(api2103.getDlqplxq(), SH2023Api2103Item.class);
-            api2103.setSh2023Api2103Items(listItems);
-            return api2103;
+            SH2023Api2103 apiData = new SH2023Api2103();
+            BeanUtils.copyProperties(data, apiData);
+            //璁剧疆绌哄睘鎬т负榛樿鍊�
+            changeObject(apiData);
+            return apiData;
         }
         if (SH2023Constant.SH_2023_API_CODE_2104.equals(inteId)) {
+            //璁剧疆绌哄睘鎬т负榛樿鍊�
+            changeObject(data);
             return data;
         }
         if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
+
+            //璁剧疆绌哄睘鎬т负榛樿鍊�
+            changeObject(data);
             return data;
         }
         if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
+            //璁剧疆绌哄睘鎬т负榛樿鍊�
+            changeObject(data);
             return data;
         }
+        //璁剧疆绌哄睘鎬т负榛樿鍊�
+        changeObject(data);
         return data;
     }
 

--
Gitblit v1.9.3