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/Fzzy40SyncService13.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 5325c26..ebfe114 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -28,11 +28,15 @@
@Autowired
private Fzzy40Sync1306 fzzySync1306;
@Autowired
+ private Fzzy40Sync1307 fzzySync1307;
+ @Autowired
private Fzzy40Sync1310 fzzySync1310;
@Autowired
private Fzzy40Sync1023 fzzySync1023;
@Autowired
private Fzzy40Sync1311 fzzySync1311;
+ @Autowired
+ private Fzzy40Sync9201 fzzySync9201;
@Autowired
private Fzzy40Sync2103 fzzy40Sync2103;
@@ -46,40 +50,44 @@
/*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
- if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) {
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && (PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())||PushProtocol.SB_GD_2023.getCode().equals(param.getPushProtocol()))) {
//骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
//鐔忚捀澶囨鏁版嵁鍚屾
fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ fzzySync9201.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
-// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
-// //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
-//
-// //鍚屾绮儏璁惧閰嶇疆淇℃伅
-// fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-// //瑙嗛鐩戞帶淇℃伅鍚屾
-// fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-// }
-//
-// /*-----鍏叡鎺ュ彛-----*/
-//
-// //娓╂箍搴︽娴嬫暟鎹悓姝�
-// fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //铏妫�娴嬪悓姝�
-// fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //姘斾綋妫�娴嬪悓姝�
-// fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //璐ㄦ鍚屾
-// fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //閫氶浣滀笟淇℃伅鍚屾
-// fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+ //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
+
+ //鍚屾绮儏璁惧閰嶇疆淇℃伅
+ fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ //瑙嗛鐩戞帶淇℃伅鍚屾
+ fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ }
+
+ /*-----鍏叡鎺ュ彛-----*/
+
+ //娓╂箍搴︽娴嬫暟鎹悓姝�
+ fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //铏妫�娴嬪悓姝�
+ fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //姘斾綋妫�娴嬪悓姝�
+ fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //璐ㄦ鍚屾
+ fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //閫氶浣滀笟淇℃伅鍚屾
+ fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//鐔忚捀浣滀笟淇℃伅鍚屾
fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ //浠撳唴瑙嗛鍥惧儚鎶撴媿鍚屾
+ fzzySync1307.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
}
}
--
Gitblit v1.9.3