From f58c03f4c98b3664f22a3ec4e920fb2a42473ab9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 30 一月 2024 18:08:02 +0800
Subject: [PATCH] 增加合同、计划数据同步时的附件信息同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

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 054561f..0975df3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -114,6 +114,7 @@
             if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
                 sysData.setUserId("410183199003187055");
             }
+            apiData.setSfzh(sysData.getUserId());
 
             //閫氱煡鍗曞彿
             apiData.setCktzdh(sysData.getNoticeId());
@@ -128,9 +129,12 @@
                     }
                 }
                 if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+                    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());
+                        }
                     }
                 }
             }
@@ -154,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());
 
             //浜у湴浠g爜
             mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());

--
Gitblit v1.9.3