From b846db8d7d0daab709774767d78d41670e083915 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 15 九月 2023 14:05:02 +0800
Subject: [PATCH] 广东专属页面--熏蒸备案修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 aaedf5b..bf00ee8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -22,7 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -68,7 +67,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz4DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
+ List<Fz40DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
@@ -77,19 +76,16 @@
List<GdApi1023Dtl> dtlList = new ArrayList<>();
List<GdApi1023Way> wayList = new ArrayList<>();
List<GdApi1023People> peopleList = new ArrayList<>();
- for (Fz4DrugLogApply data : list) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ for (Fz40DrugLogApply data : list) {
+ 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());
@@ -100,23 +96,24 @@
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();
BeanUtils.copyProperties(data, gdApi1023);
- gdApi1023.setXzbm(data.getXzbm());
+ gdApi1023.setXzbm(data.getXzbm().substring(8));
gdApi1023.setKqdm(kqdm);
gdApi1023.setDwdm(kqdm.substring(0, 18));
gdApi1023.setYjmc(data.getDrugName());
@@ -135,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