From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index e5bb7a0..caee90c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -103,11 +103,11 @@
//绮绛夌骇
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz40Quality.getFoodLevel());
api1310.setLsdjdm(mappingCode);
- api1310.setRkrq(DateUtils.addDays(fz40Quality.getTime(), -30));
+ api1310.setRkrq(fz40Quality.getStoreDate());
api1310.setJylb(fz40Quality.getType());
api1310.setJysj(fz40Quality.getTime());
- api1310.setJydw(fz40Quality.getUser());
- api1310.setJyr(fz40Quality.getUser());
+ api1310.setJydw(StringUtils.isEmpty(fz40Quality.getUnit()) ? "妫�楠屽崟浣�" : fz40Quality.getUnit());
+ api1310.setJyr(StringUtils.isEmpty(fz40Quality.getUser()) ? "妫�楠屼汉" : fz40Quality.getUser());
api1310.setJyyj(fz40Quality.getStandard());
if (StringUtils.isEmpty(fz40Quality.getZblb())) {
api1310.setZblb("2");
@@ -139,21 +139,18 @@
api1310.setZbjgpd(fz40Quality.getResult());
api1310.setQfrq(fz40Quality.getTime());
api1310.setBgcjsj(fz40Quality.getTime());
- api1310.setShrxm(fz40Quality.getCheckUser());
+ api1310.setShrxm(fz40Quality.getShrxm().contains("銆�")?fz40Quality.getShrxm().replace('銆�','|'):fz40Quality.getShrxm());
if (null == fz40Quality.getCheckTime()) {
fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
}
if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
}
+ api1310.setSpaqzbsfhg(fz40Quality.getSpaqzbsfhg());
api1310.setQysj(fz40Quality.getCheckTime());
api1310.setQyqy(fz40Quality.getCheckArea());
- api1310.setQyrxm(fz40Quality.getCheckUser());
- api1310.setJdrxm(fz40Quality.getCheckUser());
- if (fz40Quality.getCheckUser().contains("銆�")) {
- api1310.setQyrxm(fz40Quality.getCheckUser().replace('銆�', '|'));
- api1310.setJdrxm(fz40Quality.getCheckUser().replace('銆�', '|'));
- }
+ api1310.setQyrxm(fz40Quality.getCheckUser().contains("銆�") ? fz40Quality.getCheckUser().replace('銆�', '|') : fz40Quality.getCheckUser());
+ api1310.setJdrxm(fz40Quality.getCheckUser().contains("銆�") ? fz40Quality.getCheckUser().replace('銆�', '|') : fz40Quality.getCheckUser());
api1310.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());
--
Gitblit v1.9.3