From 07ff6686da8e9922a6f5a4f276e69d045e12a044 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 15:59:23 +0800
Subject: [PATCH] 调整上海接口：粮食管理相关同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 0478e46..dbeb58e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -6,6 +6,7 @@
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.GbCheckItem;
import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1310Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -43,6 +44,8 @@
@Autowired
private ApiCommonService commonService;
@Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
private Api1310Rep api1310Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -74,8 +77,8 @@
Api1105 api1105;
List<Fz40CheckItem> fz40CheckItems;
List<GbCheckItem> gbCheckList;
- StringBuilder jyxm;
- StringBuilder jyxmz;
+ String jyxm;
+ String jyxmz;
List<Api1310> api1310List;
int index = 10001;
for (Fz40Quality fz40Quality : list) {
@@ -87,8 +90,13 @@
api1310.setZjbgdh(fz40Quality.getType() + DateFormatUtils.format(fz40Quality.getTime(), "yyyyMMdd") + String.valueOf(index).substring(1));
api1310.setHwdm(api1105.getHwdm());
api1310.setKqdm(kqdm);
- api1310.setLspzdm(fz40Quality.getFoodVariety());
- api1310.setLsdjdm(fz40Quality.getFoodLevel());
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0,3));
+ api1310.setLspzdm(mappingCode);
+
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz40Quality.getFoodLevel());
+ api1310.setLsdjdm(mappingCode);
api1310.setRkrq(DateUtils.addDays(fz40Quality.getTime(), -30));
api1310.setJylb(fz40Quality.getType());
api1310.setJysj(fz40Quality.getTime());
@@ -97,8 +105,8 @@
api1310.setJyyj(fz40Quality.getStandard());
api1310.setZblb("2");
//妫�娴嬮」锛屾娴嬪��
- jyxm = new StringBuilder();
- jyxmz = new StringBuilder();
+ jyxm = "";
+ jyxmz = "";
fz40CheckItems = fzzySync1203Rep.listInoutCheckItem(fz40Quality.getId(), deptId.substring(0, 4));
if (null != fz40CheckItems && fz40CheckItems.size() > 0) {
@@ -110,12 +118,12 @@
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
}
- jyxm.append(",").append(gbCheckList.get(0).getCode());
- jyxmz.append(",").append(fz40CheckItem.getValue());
+ jyxm += gbCheckList.get(0).getCode() + ",";
+ jyxmz += fz40CheckItem.getValue() + ",";
}
}
- api1310.setJyxm(jyxm.toString().substring(1));
- api1310.setJyxmz(jyxmz.toString().substring(1));
+ api1310.setJyxm(jyxm);
+ api1310.setJyxmz(jyxmz);
api1310.setZbjgpd(fz40Quality.getResult());
api1310.setQfrq(fz40Quality.getTime());
@@ -126,8 +134,8 @@
api1310.setQyrxm(fz40Quality.getCheckUser());
api1310.setJdrxm(fz40Quality.getCheckUser());
- api1310.setYpsl(fz40Quality.getYpsl());
- api1310.setDbsl(fz40Quality.getDbsl());
+ api1310.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());
+ api1310.setDbsl(fz40Quality.getDbsl() == null ? 0.0 : fz40Quality.getDbsl());
api1310.setYpdj(StringUtils.isEmpty(fz40Quality.getYpdj())?"0": fz40Quality.getYpdj());
api1310.setSfzcccnx(StringUtils.isEmpty(fz40Quality.getNormalYear())?"0": fz40Quality.getNormalYear());
api1310.setBz(fz40Quality.getRemark());
--
Gitblit v1.9.3