Merge remote-tracking branch 'origin/main'

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

@@ -4,6 +4,7 @@ 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.ISrsClassService;
 import com.srs.comprehensive.service.ISrsMajorsService;
 import com.srs.comprehensive.service.SyncDataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,9 @@ public class SyncDataController extends BaseController {
     ICphTeacherService iCphTeacherService;
     @Autowired
     ISrsMajorsService iSrsMajorsService;
+    @Autowired
+    ISrsClassService iSrsClassService;
+    //中间表教职工信息
     @RequestMapping("/getEmployEEInfoList")
     public TableDataInfo getEmployEEInfoList(){
         startPage();
@@ -54,9 +58,19 @@ public class SyncDataController extends BaseController {
     }
     //中间表班级
     @RequestMapping("/classInfoList")
-    public TableDataInfo classInfoList(){
+    public TableDataInfo classInfoList(String bjdm){
         startPage();
-        List<Map> list=syncDataService.getClassInfoList();
+        List<Map> list=syncDataService.getClassInfoList(bjdm);
         return getDataTable(list);
     }
+
+    //同步班级
+    @RequestMapping("/synchronousClass")
+    public AjaxResult synchronousClass(){
+        List<Map> list=syncDataService.getClassInfoList(null);
+        iSrsClassService.synchronousMYSQL(list);//同步班级
+        return success(list);
+    }
+
+
 }