From db74943b46ffb5245477894f394c368cc04f93e7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 16 九月 2025 14:48:31 +0800
Subject: [PATCH] 调整品种获取

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
index efe0608..88b74f2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -78,18 +78,18 @@
                 apiData.setLssl(sysData.getNumber());
                 apiData.setHzsl(sysData.getChangeNumber());
                 apiData.setBzwh(sysData.getApprovalId());
-                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                 apiData.setLspzdm(mappingCode);
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                 apiData.setHzqlsxzdm(mappingCode);
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType());
                 apiData.setHzhlsxzdm(mappingCode);
                 apiData.setHzrq(sysData.getChangeTime());
-                apiData.setCcshr(sysData.getCcshr());
-                apiData.setZjshr(sysData.getZjshr());
-                apiData.setTjshr(sysData.getTjshr());
-                apiData.setKjshr(sysData.getKjshr());
-                apiData.setLdshr(sysData.getLdshr());
+                apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃壒浜�" : sysData.getCcshr());
+                apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃壒浜�" : sysData.getZjshr());
+                apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃壒浜�" : sysData.getTjshr());
+                apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃壒浜�" : sysData.getKjshr());
+                apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃壒浜�" : sysData.getLdshr());
                 apiData.setBz(sysData.getRemark());
                 apiData.setZhgxsj(new Date());
 
@@ -98,9 +98,12 @@
                 apiData.setKqdm(kqdm);
                 apiData.setSyncTime(new Date());
                 api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh());
-                if(null == api1210List || api1210List.isEmpty()){
+                if (null == api1210List || api1210List.isEmpty()) {
                     apiData.setCzbz(Constant.CZBZ_I);
-                }else {
+                } else {
+                    if (StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())) {
+                        apiData.setJhmxdh(api1210List.get(0).getJhmxdh());
+                    }
                     apiData.setCzbz(api1210List.get(0).getCzbz());
                 }
                 //淇濆瓨鏁版嵁

--
Gitblit v1.9.3