xgxt_sd/zhxg_java
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_java

Browse Source 
# Conflicts:
#	srs-admin/src/main/resources/application.yml
This commit is contained in:
18154758993
2025-12-29 10:51:36 +08:00
parent 59162701ae 2573d4bebd
commit 1c9cb5be8e
12 changed files with 358 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java
View File

@@ -152,21 +152,12 @@ public class CphSqlServerDataController extends BaseController {
return success(list);
}
// //同步辅导员
// @RequestMapping("/synchronousEmployEEInfoList")
// public AjaxResult synchronousEmployEEInfoList(){
// //startPage();
// List<Map> list=sqlServerDataService.getEmployEEInfoList();
// iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
// iCphTeacherService.Usertb();
// return success();
// }
//同步教职工
//同步辅导员
@RequestMapping("/synchronousEmployEEInfoList")
public AjaxResult synchronousEmployEEInfoList(){
//startPage();
List<Map> list=sqlServerDataService.getEmployEEInfoList();
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
iCphTeacherService.Usertb();
return success();
}

22
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
View File

@@ -4,9 +4,11 @@ import com.srs.common.core.controller.BaseController;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.core.page.TableDataInfo;
import com.srs.comprehensive.service.ICphTeacherService;
import com.srs.comprehensive.service.ISrsMajorsService;
import com.srs.comprehensive.service.SyncDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +22,8 @@ public class SyncDataController extends BaseController {
SyncDataService syncDataService;
@Autowired
ICphTeacherService iCphTeacherService;
@Autowired
ISrsMajorsService iSrsMajorsService;
@RequestMapping("/getEmployEEInfoList")
public TableDataInfo getEmployEEInfoList(){
startPage();
@@ -30,8 +34,22 @@ public class SyncDataController extends BaseController {
@RequestMapping("/synchronousEmployEEInfoList")
public AjaxResult synchronousEmployEEInfoList(){
List<Map> list=syncDataService.getEmployEEInfoList();
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
//iCphTeacherService.Usertb();
iCphTeacherService.synchronousMYSQL(list);//同步教职工
iCphTeacherService.UsertbNew();
return success();
}
//中间表专业信息
@RequestMapping("/getSpecialtyInfoList")
public TableDataInfo getSpecialtyInfoList(String zydm){
startPage();
List<Map> list=syncDataService.getSpecialtyInfoList(zydm);
return getDataTable(list);
}
//同步专业
@RequestMapping("/synchronousSpecialtyInfoList")
public AjaxResult synchronousSpecialtyInfoList(){
List<Map> list=syncDataService.getSpecialtyALLInfo();
iSrsMajorsService.synchronousMYSQL(list);//同步专业
return success();
}
}