From d4fe921568bc29d72644a55fd194adf7f9277cb5 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 22 十一月 2025 15:28:35 +0800
Subject: [PATCH] feat: 将旧系统数据同步到新系统
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java
index 6b9cb51..775f837 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java
@@ -1,16 +1,14 @@
package com.ruoyi.quartz.task;
import com.ruoyi.system.domain.DepartmentSyncDTO;
+import com.ruoyi.system.domain.OrderClassDTO;
import com.ruoyi.system.domain.UserSyncDTO;
-import com.ruoyi.system.service.IDepartmentSyncDataService;
-import com.ruoyi.system.service.IUserSyncDataService;
+import com.ruoyi.system.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.service.IDepartmentSyncService;
-import com.ruoyi.system.service.IUserSyncService;
import java.util.List;
@@ -46,6 +44,15 @@
private List<UserSyncDTO> getUserData(){
return userSyncDataService.getOaUsers();
}
+
+ @Autowired
+ private IOrderClassDataService orderClassDataService;
+ private List<OrderClassDTO> getServiceOrdCode() {
+ return orderClassDataService.getServiceOrderClass();
+ }
+ private List<OrderClassDTO> getDispatchOrdCode() {
+ return orderClassDataService.getDispatchOrderClass();
+ }
/**
* 鍚屾OA鏁版嵁锛堥儴闂�+鐢ㄦ埛锛�
* 鎸夐『搴忔墽琛岋細1. 閮ㄩ棬鍚屾 2. 鐢ㄦ埛鍚屾
@@ -63,7 +70,7 @@
// 绗竴姝ワ細鍚屾閮ㄩ棬
log.info("銆愭楠�1/2銆戝紑濮嬪悓姝ラ儴闂ㄦ暟鎹�...");
- AjaxResult deptResult = departmentSyncService.syncBranchDepartments(this.getDept());
+ AjaxResult deptResult = departmentSyncService.syncBranchDepartments(this.getDept(),this.getServiceOrdCode(),this.getDispatchOrdCode());
if (deptResult.get("code").equals(200))
{
@@ -118,7 +125,7 @@
try
{
log.info("==========寮�濮嬫墽琛岄儴闂ㄥ悓姝ヤ换鍔�==========");
- AjaxResult result = departmentSyncService.syncBranchDepartments(this.getDept());
+ AjaxResult result = departmentSyncService.syncBranchDepartments(this.getDept(),this.getServiceOrdCode(),this.getDispatchOrdCode());
if (result.get("code").equals(200))
{
--
Gitblit v1.9.1