From 4941a9e02e1a89ae3e584787ac1cbf580825f2f2 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 25 十一月 2024 18:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 8762f94..e5bb7a0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -70,7 +70,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40Quality> list = fzzySync1310Rep.findDateByTime(start, end);
+ List<Fz40Quality> list = fzzySync1310Rep.findDateByTime(deptId, start, end);
if (null == list || list.isEmpty()) {
return;
}
@@ -82,14 +82,18 @@
String jyxm;
String jyz;
List<Api1310> api1310List;
- int index = 10001;
+
for (Fz40Quality fz40Quality : list) {
api1105 = commonService.getApi1105Cache(fz40Quality.getDepotId());
if (null == api1105) {
continue;
}
api1310 = new Api1310();
- api1310.setZjbgdh(fz40Quality.getType() + DateFormatUtils.format(fz40Quality.getTime(), "yyyyMMdd") + String.valueOf(index).substring(1));
+ if (fz40Quality.getId().contains("ZJ_")) {
+ api1310.setZjbgdh(fz40Quality.getType() + fz40Quality.getId().substring(3));
+ } else {
+ api1310.setZjbgdh(fz40Quality.getType() + fz40Quality.getId());
+ }
api1310.setHwdm(api1105.getHwdm());
api1310.setKqdm(kqdm);
//绮鍝佺
@@ -105,7 +109,12 @@
api1310.setJydw(fz40Quality.getUser());
api1310.setJyr(fz40Quality.getUser());
api1310.setJyyj(fz40Quality.getStandard());
- api1310.setZblb("2");
+ if (StringUtils.isEmpty(fz40Quality.getZblb())) {
+ api1310.setZblb("2");
+ } else {
+ api1310.setZblb(fz40Quality.getZblb());
+ }
+
//妫�娴嬮」锛屾娴嬪��
jyxm = "";
jyz = "";
@@ -131,7 +140,7 @@
api1310.setQfrq(fz40Quality.getTime());
api1310.setBgcjsj(fz40Quality.getTime());
api1310.setShrxm(fz40Quality.getCheckUser());
- if(null == fz40Quality.getCheckTime()){
+ if (null == fz40Quality.getCheckTime()) {
fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
}
if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
@@ -141,23 +150,31 @@
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.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());
+ api1310.setYpbh(fz40Quality.getYpbh());
+ api1310.setQydbh(fz40Quality.getQydbh());
api1310.setZhgxsj(new Date());
+ api1310.setBizId(fz40Quality.getId());
- api1310List = api1310Rep.getDataByZjbgdh(api1310.getZjbgdh());
+ api1310List = api1310Rep.getDataByBizId(api1310.getBizId());
if (null == api1310List || api1310List.isEmpty()) {
api1310.setCzbz(Constant.CZBZ_I);
} else {
api1310.setCzbz(api1310List.get(0).getCzbz());
+ api1310.setBglx(api1310List.get(0).getBglx());
}
api1310Rep.save(api1310);
- index++;
}
} catch (Exception e) {
log.error("---鍚屾澶辫触----{}", e);
--
Gitblit v1.9.3