From 54b61daf58037385cb8d46404b12a95786c7c8f3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 28 六月 2024 19:55:06 +0800
Subject: [PATCH] 上海省平台协议-增加数据相符性接口

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 fb5929b..c40518c 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;
             }
@@ -89,7 +89,7 @@
                     continue;
                 }
                 api1310 = new Api1310();
-                api1310.setZjbgdh(fz40Quality.getType() + DateFormatUtils.format(fz40Quality.getTime(), "yyyyMMdd") + String.valueOf(index).substring(1));
+                api1310.setZjbgdh(fz40Quality.getType() + fz40Quality.getId());
                 api1310.setHwdm(api1105.getHwdm());
                 api1310.setKqdm(kqdm);
                 //绮鍝佺
@@ -105,7 +105,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 +136,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())) {
@@ -150,12 +155,14 @@
                 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);

--
Gitblit v1.9.3