From 9cec6b5c40e716cba4ab687f1e8a61c9cd95b2d7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 25 四月 2025 09:26:12 +0800
Subject: [PATCH] 熏蒸备案自动上传,出库信息同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index 53a9aee..9828554 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -75,11 +75,11 @@
         apiLog.setType(ApiLog.TYPE_SYNC);
         apiLog.setKqdm(deptId);
         apiLog.setUploadTime(new Date());
-        apiLog.setInteId(ApiCodeConstant.API_1023);
+        apiLog.setInteId(ApiCodeConstant.API_9201);
         apiLog.setStatus(99);
         apiLog.setId(ContextUtil.getUUID());
         try {
-            List<Fz40DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
+            List<Fz40DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId, start, end);
 
             if (null == list || list.isEmpty()) {
                 log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
@@ -117,8 +117,8 @@
                 GD2022Api1023.setYjlx(data.getDrugType());
                 GD2022Api1023.setLqrq(data.getLqsj());
                 GD2022Api1023.setZhgxsj(data.getUpdateTime());
-                if(data.getLqr().contains("銆�")){
-                    GD2022Api1023.setLqr(data.getLqr().replace("銆�", "|"));
+                if (data.getLqr().contains("銆�")) {
+                    GD2022Api1023.setLqr(data.getLqr().replace('銆�', '|'));
                 }
 
                 //鍌ㄧ伯绮儏鏄庣粏琛�
@@ -132,7 +132,7 @@
                 }
 
                 //绮鍝佺
-                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety().substring(0, 3));
+                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety());
                 gd2022Api1023Dtl.setLspzdm(mappingCode);
                 gd2022Api1023Dtl.setLsxzdm(data.getFoodType());
                 gd2022Api1023Dtl.setLsdjdm(data.getFoodLevel());
@@ -185,10 +185,9 @@
                         gd2022Api1023People = new Gd2022Api1023People();
                         BeanUtils.copyProperties(people, gd2022Api1023People);
                         gd2022Api1023People.setXm(people.getMx());
-                        if(StringUtils.isEmpty(gd2022Api1023People.getZyzg())){
-                            gd2022Api1023People.setZyzg("楂樼骇");
+                        if (StringUtils.isEmpty(people.getZyzg())) {
+                            gd2022Api1023People.setZyzg("涓骇");
                         }
-
                         peopleList.add(gd2022Api1023People);
                     }
                     GD2022Api1023.setPeoples(peopleList);
@@ -198,19 +197,20 @@
 
                 infoData.setKqdm(kqdm);
                 infoData.setInteType(Constant.API_CATEGORY_13);
-                infoData.setInteId(ApiCodeConstant.API_1023);
-                infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
+                infoData.setInteId(ApiCodeConstant.API_9201);
+                infoData.setBizType(PushProtocol.SB_GD_2023.getCode());
                 infoData.setUpdateTime(new Date());
                 infoData.setDataId(data.getXzbm());
-                infoData.setId(data.getXzbm());
-                apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm);
+                apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_9201, data.getXzbm(), kqdm);
 
                 if (null == apiInfoList || apiInfoList.isEmpty()) {
                     GD2022Api1023.setCzbz(Constant.CZBZ_I);
                     infoData.setCzbz(Constant.CZBZ_I);
+                    infoData.setId(ContextUtil.getUUID());
                 } else {
                     GD2022Api1023.setCzbz(apiInfoList.get(0).getCzbz());
                     infoData.setCzbz(apiInfoList.get(0).getCzbz());
+                    infoData.setId(apiInfoList.get(0).getId());
                 }
 
                 infoData.setData(JSON.toJSONString(GD2022Api1023));

--
Gitblit v1.9.3