From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
index 91c5aa1..2747e54 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
@@ -1,12 +1,11 @@
package com.fzzy.async.fzzy35;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService13;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1302;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1303;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1304;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1310;
+import com.fzzy.async.fzzy35.impl.*;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,6 +24,10 @@
private Fzzy35Sync1304 fzzySync1304;
@Autowired
private Fzzy35Sync1310 fzzySync1310;
+ @Autowired
+ private Fzzy35Sync1023 fzzySync1023;
+ @Autowired
+ private Fzzy35Sync1306 fzzy35Sync1306;
@Override
@@ -47,19 +50,19 @@
//璐ㄦ鍚屾
fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-// /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
-// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) {
-// //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
-// //鐔忚捀澶囨鏁版嵁鍚屾
-// fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd());
-//
-// }
-//
-// //閫氶浣滀笟淇℃伅鍚屾
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) {
+ //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
+ //鐔忚捀澶囨鏁版嵁鍚屾
+ fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ }
+
+ //閫氶浣滀笟淇℃伅鍚屾
// fzzySync1305.syncData(param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //鐔忚捀浣滀笟淇℃伅鍚屾
-// fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+
+ //鐔忚捀浣滀笟淇℃伅鍚屾
+ fzzy35Sync1306.syncData(param.getDeptId(), param.getDeptId(), param.getStart(), param.getEnd());
}
}
--
Gitblit v1.9.3