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 | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 1df9693..ab98933 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;
@@ -56,7 +55,7 @@
* @param start
* @param end
*/
- public void syncData(String deptId, Date start, Date end) {
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
log.info("-------------1023鎺ュ彛璁惧淇℃伅寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
@@ -64,29 +63,29 @@
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setInteId(ApiCodeConstant.API_1023);
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("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
return;
}
-
List<GdApi1023Dtl> dtlList = new ArrayList<>();
List<GdApi1023Way> wayList = new ArrayList<>();
List<GdApi1023People> peopleList = new ArrayList<>();
- for (Fz4DrugLogApply data : list) {
- //鍌ㄧ伯绮儏鏄庣粏琛�
- String tbrq = "";
- if(null != data.getTbrq()){
- tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
+ for (Fz40DrugLogApply data : list) {
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ if (apiInfoList.size() != 0) {
+ continue;
}
- List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm()+data.getDeptId()+tbrq);
+ //鍌ㄧ伯绮儏鏄庣粏琛�
+ 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());
@@ -97,24 +96,26 @@
gdApi1023Dtl.setZz(dtl.getPerImpurity());
dtlList.add(gdApi1023Dtl);
}
- List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm()+data.getDeptId()+tbrq);
+ 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(data.getXzbm()+data.getDeptId()+tbrq);
+ 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);
+ BeanUtils.copyProperties(data, gdApi1023);
gdApi1023.setXzbm(data.getXzbm());
- gdApi1023.setKqdm(data.getDeptId());
+ gdApi1023.setKqdm(kqdm);
+ gdApi1023.setDwdm(kqdm.substring(0, 18));
gdApi1023.setYjmc(data.getDrugName());
gdApi1023.setYjlx(data.getDrugType());
gdApi1023.setZhgxsj(data.getUpdateTime());
@@ -126,14 +127,13 @@
//鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
ApiInfoData infoData = new ApiInfoData();
infoData.setId(ContextUtil.getUUID());
- infoData.setKqdm(data.getDeptId());
+ infoData.setKqdm(kqdm);
infoData.setInteType(Constant.API_CATEGORY_13);
infoData.setInteId(ApiCodeConstant.API_1023);
infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
- infoData.setUpdateTime(data.getUpdateTime());
- infoData.setDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd"));
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getXzbm());
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd"));
if (null == apiInfoList || apiInfoList.isEmpty()) {
gdApi1023.setCzbz(Constant.CZBZ_I);
infoData.setCzbz(Constant.CZBZ_I);
--
Gitblit v1.9.3