From 7b63a0ffef218d3f09de23545fc55998c2dd9f3e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 15 九月 2023 14:02:42 +0800
Subject: [PATCH] 广东专属页面--熏蒸备案修改

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 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 75b478e..ab98933 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -77,18 +77,15 @@
             List<GdApi1023Way> wayList = new ArrayList<>();
             List<GdApi1023People> peopleList = new ArrayList<>();
             for (Fz40DrugLogApply data : list) {
-                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
                 if (apiInfoList.size() != 0) {
                     continue;
                 }
                 //鍌ㄧ伯绮儏鏄庣粏琛�
-                String tbrq = "";
-                if (null != data.getTbrq()) {
-                    tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
-                }
-                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(kqdm + tbrq + data.getXzbm());
+                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
+                GdApi1023Dtl gdApi1023Dtl;
                 for (Fz40DrugLogDtl dtl : dtls) {
-                    GdApi1023Dtl gdApi1023Dtl = new GdApi1023Dtl();
+                    gdApi1023Dtl = new GdApi1023Dtl();
                     BeanUtils.copyProperties(dtl, gdApi1023Dtl);
                     gdApi1023Dtl.setCfdm(dtl.getDepotId());
                     gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
@@ -99,18 +96,19 @@
                     gdApi1023Dtl.setZz(dtl.getPerImpurity());
                     dtlList.add(gdApi1023Dtl);
                 }
-                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(kqdm + tbrq + data.getXzbm());
+                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
+                GdApi1023Way gdApi1023Way;
                 for (Fz40DrugLogWay way : ways) {
-                    GdApi1023Way gdApi1023Way = new GdApi1023Way();
+                    gdApi1023Way = new GdApi1023Way();
                     BeanUtils.copyProperties(way, gdApi1023Way);
                     wayList.add(gdApi1023Way);
                 }
-                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(kqdm + tbrq + data.getXzbm());
+                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
+                GdApi1023People gdApi1023People;
                 for (Fz40DrugLogPeople people : peoples) {
-                    GdApi1023People gdApi1023People = new GdApi1023People();
+                    gdApi1023People = new GdApi1023People();
                     BeanUtils.copyProperties(people, gdApi1023People);
                     peopleList.add(gdApi1023People);
-
                 }
 
                 GdApi1023 gdApi1023 = new GdApi1023();
@@ -134,7 +132,7 @@
                 infoData.setInteId(ApiCodeConstant.API_1023);
                 infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
                 infoData.setUpdateTime(new Date());
-                infoData.setDataId(kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+                infoData.setDataId(data.getXzbm());
 
                 if (null == apiInfoList || apiInfoList.isEmpty()) {
                     gdApi1023.setCzbz(Constant.CZBZ_I);

--
Gitblit v1.9.3