From cdaffb0adb7b89629178892884976be7287a8a8a Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Sun, 4 Jan 2026 10:44:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/SyncDataController.java | 11 +++-- .../comprehensive/domain/Dto/SelectClass.java | 9 ++++ .../comprehensive/mapper/SyncDataMapper.java | 4 +- .../service/SyncDataService.java | 4 +- .../service/impl/SrsClassServiceImpl.java | 47 +++++++++---------- .../service/impl/SyncDataServiceImpl.java | 5 +- .../mapper/comprehensive/SyncDataMapper.xml | 7 +-- 7 files changed, 51 insertions(+), 36 deletions(-) create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index 8ed262c..a5a9a14 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -3,6 +3,7 @@ package com.srs.web.controller.comprehensive; 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.domain.Dto.SelectClass; import com.srs.comprehensive.service.ICphTeacherService; import com.srs.comprehensive.service.ISrsClassService; import com.srs.comprehensive.service.ISrsMajorsService; @@ -58,18 +59,18 @@ public class SyncDataController extends BaseController { } //中间表班级 @RequestMapping("/classInfoList") - public TableDataInfo classInfoList(String bjdm){ + public TableDataInfo classInfoList(SelectClass selectClass){ startPage(); - List list=syncDataService.getClassInfoList(bjdm); + List list=syncDataService.getClassInfoList(selectClass); return getDataTable(list); } //同步班级 @RequestMapping("/synchronousClass") - public AjaxResult synchronousClass(){ - List list=syncDataService.getClassInfoList(null); + public AjaxResult synchronousClass(SelectClass selectClass){ + List list=syncDataService.getClassInfoList(selectClass); iSrsClassService.synchronousMYSQL(list);//同步班级 - return success(list); + return success(); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java new file mode 100644 index 0000000..241cb45 --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java @@ -0,0 +1,9 @@ +package com.srs.comprehensive.domain.Dto; + +import lombok.Data; + +@Data +public class SelectClass { + public String bjdm;//班级代码 + public String gradeCode;//年级代码 +} diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java index b76ae44..a83a9de 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java @@ -1,5 +1,7 @@ package com.srs.comprehensive.mapper; +import com.srs.comprehensive.domain.Dto.SelectClass; + import java.util.List; import java.util.Map; @@ -7,5 +9,5 @@ public interface SyncDataMapper { public List getEmployEEInfoList(String zgh);//教职工 public List getSpecialtyInfoList(String zydm);//专业 public List getSpecialtyALLInfo();//所有专业 - public List getClassInfoList(String bjdm);//班级 + public List getClassInfoList(SelectClass selectClass);//班级 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java index 4a6bcd1..83d0d5f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java @@ -1,5 +1,7 @@ package com.srs.comprehensive.service; +import com.srs.comprehensive.domain.Dto.SelectClass; + import java.util.List; import java.util.Map; @@ -7,5 +9,5 @@ public interface SyncDataService { List getEmployEEInfoList(String zgh);//教职工 List getSpecialtyInfoList(String zydm);//专业 List getSpecialtyALLInfo();//所有专业 - List getClassInfoList(String bjdm);//班级 + List getClassInfoList(SelectClass selectClass);//班级 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java index 697aab7..5d76f9a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java @@ -397,17 +397,17 @@ public class SrsClassServiceImpl extends ServiceImpl im } } } - //使用辅导员工号查询辅导员id - Object bjdmsobj=map.get("bjdm"); - if (bjdmsobj!=null) { - String gh =bjdmsobj.toString();//辅导员职工号 - if (gh!=null) { - CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 - if (fdy!=null) { - srsClass.setTeacherId(fdy.getTeacherId());//辅导员id - } - } - } +// //使用辅导员工号查询辅导员id +// Object bjdmsobj=map.get("bjdm"); +// if (bjdmsobj!=null) { +// String gh =bjdmsobj.toString();//辅导员职工号 +// if (gh!=null) { +// CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 +// if (fdy!=null) { +// srsClass.setTeacherId(fdy.getTeacherId());//辅导员id +// } +// } +// } Object bjmcobj=map.get("bjmc"); if(bjmcobj!=null) { srsClass.setClassName(bjmcobj.toString()); @@ -425,8 +425,7 @@ public class SrsClassServiceImpl extends ServiceImpl im } Object njid=map.get("njid"); if (njid!=null) { - //通过sqlserver数据库的年级id查询年级代码，使用年级代码查询mysql的年级id - String njdm = gets(Long.valueOf(njid.toString()));//年级代码 + String njdm =njid.toString();//年级代码 Long gradeId = srsClassMapper.getGradeId(njdm);//使用年级代码查询本地年级id if (gradeId!=null) { srsClass.setGradeId(gradeId);//年级编号 @@ -435,7 +434,7 @@ public class SrsClassServiceImpl extends ServiceImpl im srsClass.setStatus("0"); Object zyidobj=map.get("zyid"); if (zyidobj!=null) { - String zydm = getzydm(Long.valueOf(zyidobj.toString()));//专业代码 + String zydm =zyidobj.toString();//专业代码 //使用专业代码查询本地专业id if (zydm!=null) { Long zyid = srsMajorsMapper.selectMajorId(zydm); @@ -445,16 +444,16 @@ public class SrsClassServiceImpl extends ServiceImpl im } } //使用辅导员工号查询辅导员id - Object bjdmsobj=map.get("bjdm"); - if (bjdmsobj!=null) { - String gh = getfdy(bjdmsobj.toString());//辅导员职工号 - if (gh!=null) { - CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 - if (fdy!=null) { - srsClass.setTeacherId(fdy.getTeacherId());//辅导员id - } - } - } +// Object bjdmsobj=map.get("bjdm"); +// if (bjdmsobj!=null) { +// String gh = getfdy(bjdmsobj.toString());//辅导员职工号 +// if (gh!=null) { +// CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 +// if (fdy!=null) { +// srsClass.setTeacherId(fdy.getTeacherId());//辅导员id +// } +// } +// } Object bjmcobj=map.get("bjmc"); if(bjmcobj!=null) { srsClass.setClassName(bjmcobj.toString()); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java index 3af4303..9fee4f7 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java @@ -2,6 +2,7 @@ package com.srs.comprehensive.service.impl; import com.srs.common.annotation.DataSource; import com.srs.common.enums.DataSourceType; +import com.srs.comprehensive.domain.Dto.SelectClass; import com.srs.comprehensive.mapper.SyncDataMapper; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +28,7 @@ public class SyncDataServiceImpl implements SyncDataService { return syncDataMapper.getSpecialtyALLInfo(); } @Override - public List getClassInfoList(String bjdm){ - return syncDataMapper.getClassInfoList(bjdm); + public List getClassInfoList(SelectClass selectClass){ + return syncDataMapper.getClassInfoList(selectClass); } } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index d48d2c0..e6bf7eb 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -15,7 +15,7 @@ - + select BJBH as bjdm,BJSSJXZYBH as zyid,BJMC as bjmc,BJSSNJ as njid,BJJC from from_gxsdxyxxzx_class and BJBH=#{bjdm} + and BJSSNJ=#{gradeCode}