From acae4ed906d582f41934854881b81d2242525b7d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 28 十一月 2023 21:53:39 +0800
Subject: [PATCH] 更新同步计划时，不区分类型，统一更新为轮换计划
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
index f2122d2..ef3813e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
@@ -8,7 +8,7 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Pest;
+import com.fzzy.async.fzzy35.entity.Fz35Pest;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1303Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -60,7 +60,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
- List<Pest> list = fzzy35Sync1303Rep.findPestByReceiveDate(start, end);
+ List<Fz35Pest> list = fzzy35Sync1303Rep.findPestByReceiveDate(start, end);
if (null == list || list.isEmpty()) {
return;
}
@@ -68,17 +68,17 @@
Date syncTime = new Date();
Api1303 api1303;
Api1105 api1105;
-
- for (Pest pest : list) {
+ List<Api1303> api1303List;
+ for (Fz35Pest fz35Pest : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(pest.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35Pest.getDepotId());
if (null == api1105) {
continue;
}
api1303 = new Api1303();
- api1303.setHcjcdh(api1105.getHwdm() + pest.getBatchId());
- api1303.setJcsj(pest.getReceiveDate());
+ api1303.setHcjcdh(api1105.getHwdm() + fz35Pest.getBatchId());
+ api1303.setJcsj(fz35Pest.getReceiveDate());
api1303.setHwdm(api1105.getHwdm());
//妫�鏌ュ铏柟娉曪紝0-杩滅▼銆�1-浜哄伐銆�2-鍏朵粬
@@ -90,24 +90,29 @@
api1303.setHczl("21212");
//铏彛瀵嗗害鍊奸泦鍚�
- String ckmdzjh = this.geeCkmdzjh(pest.getPestMax(), pest.getPoints());
+ String ckmdzjh = this.geeCkmdzjh(fz35Pest.getPestMax(), fz35Pest.getPoints());
api1303.setCkmdzjh(ckmdzjh);
//铏伯绛夌骇鍒ゅ畾锛�531-鍩烘湰鏃犺櫕绮��532-涓�鑸櫕绮��533涓ラ噸铏伯銆�534鍗卞铏伯
api1303.setCldjpd("531");
- if (pest.getPestMax() > 5) {
+ if (fz35Pest.getPestMax() > 5) {
api1303.setCldjpd("532");
}
- if (pest.getPestMax() > 30) {
+ if (fz35Pest.getPestMax() > 30) {
api1303.setCldjpd("533");
}
- api1303.setCzbz(Constant.CZBZ_I);
api1303.setZhgxsj(syncTime);
- api1303.setBizId(pest.getBatchId());
+ api1303.setBizId(fz35Pest.getBatchId());
api1303.setKqdm(api1105.getKqdm());
api1303.setSyncTime(syncTime);
+ api1303List = api1303Rep.getDataByHcjcdh(api1303.getHcjcdh());
+ if(null == api1303List || api1303List.isEmpty()){
+ api1303.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1303.setCzbz(api1303List.get(0).getCzbz());
+ }
api1303Rep.save(api1303);
}
--
Gitblit v1.9.3