From 8d764216fb59f24f1857ec5ab0b0a73fbbab19ae Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 12 Sep 2025 02:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E8=81=8C=E5=B7=A5?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphSqlServerDataController.java | 13 +- .../service/impl/CphTeacherServiceImpl.java | 117 +++--------------- .../srs/system/mapper/QgzxTeacherMapper.java | 1 + .../mapper/system/QgzxTeacherMapper.xml | 4 + 4 files changed, 36 insertions(+), 99 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java index 977dd5a..829e0dd 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java @@ -152,12 +152,21 @@ public class CphSqlServerDataController extends BaseController { return success(list); } - //同步辅导员 +// //同步辅导员 +// @RequestMapping("/synchronousEmployEEInfoList") +// public AjaxResult synchronousEmployEEInfoList(){ +// //startPage(); +// List list=sqlServerDataService.getEmployEEInfoList(); +// iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员 +// iCphTeacherService.Usertb(); +// return success(); +// } + //同步教职工 @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ //startPage(); List list=sqlServerDataService.getEmployEEInfoList(); - iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员 + iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工 iCphTeacherService.Usertb(); return success(); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index 52ce987..0eb78b7 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -464,106 +464,29 @@ public class CphTeacherServiceImpl implements ICphTeacherService @Override @Transactional(rollbackFor = Exception.class) public void sqlserverSynchronousMYSQL(List list) { - //教职工列表 - List qgzxTeachers = qgzxTeacherMapper.selectTeacherList(); - //查找重复值 - List updateMap = list.stream() - .filter(obj1 -> qgzxTeachers - .stream().anyMatch(obj2 -> { - Object xhObj = obj1.get("zgh"); - if (xhObj != null) { - String zgh = xhObj.toString(); - return obj2.getEmployeeId().equals(zgh); - } - return false; - })) - .collect(Collectors.toList()); - - //添加需要 - List kshList2 = qgzxTeachers.stream() - .map(QgzxTeacher::getEmployeeId) - .collect(Collectors.toList()); - - List insertMap = list.stream() - .filter(obj -> { - Object xhObj = obj.get("zgh"); - return xhObj != null && !kshList2.contains(xhObj.toString()); - }) - .collect(Collectors.toList()); - //添加 - List insertStudentList = new ArrayList<>(); - for (Map map:insertMap){ - QgzxTeacher qgzxTeacher = new QgzxTeacher(); - Object xmObj = map.get("xm"); - if (xmObj != null) { - qgzxTeacher.setName(xmObj.toString()); + for (Map map : list) { + String zgh = (String) map.get("zgh"); + String xm=(String) map.get("xm"); + String xb=(String) map.get("xb"); + String yxdm=(String) map.get("yxdm"); + QgzxTeacher qgzxTeacher = qgzxTeacherMapper.selectQgzxTeacherByEmployeeId(zgh); + Long deptId = qgzxTeacherMapper.selectDeptCode(yxdm); + QgzxTeacher entity=new QgzxTeacher(); + entity.setEmployeeId(zgh); + entity.setName(xm); + entity.setGender(xb); + if(deptId!=null) { + entity.setDeptId(deptId); } - Object xbObj = map.get("xb"); - if (xbObj != null) { - String s = xbObj.toString(); - if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { - qgzxTeacher.setGender(xbObj.toString()); - } + entity.setStatus("1"); + entity.setCreateTime(DateUtils.getNowDate()); + if(qgzxTeacher==null){ + qgzxTeacherMapper.insertQgzxTeacher(entity); + }else{ + entity.setTeacherId(qgzxTeacher.getTeacherId()); + qgzxTeacherMapper.updateQgzxTeacher(entity); } - Object zghObj = map.get("zgh"); - if (zghObj != null) { - qgzxTeacher.setEmployeeId(zghObj.toString()); - } - //学院id - Object yxdmObj = map.get("yxdm"); - if (yxdmObj!=null) { - Long deptId = qgzxTeacherMapper.selectDeptCode(yxdmObj.toString()); - if (deptId != null) { - qgzxTeacher.setDeptId(deptId); - } - } - qgzxTeacher.setStatus("1"); - qgzxTeacher.setCreateTime(DateUtils.getNowDate()); - insertStudentList.add(qgzxTeacher); } - if (insertStudentList.size()!=0) { - qgzxTeacherMapper.insertBatchSomeColumn(insertStudentList); - } - //修改 - List updateSrsStudent = new ArrayList<>(); - for (Map map:updateMap){ - QgzxTeacher qgzxTeacher = new QgzxTeacher(); - Object xmObj = map.get("xm"); - if (xmObj != null) { - qgzxTeacher.setName(xmObj.toString()); - } - Object xbObj = map.get("xb"); - if (xbObj != null) { - String s = xbObj.toString(); - if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { - qgzxTeacher.setGender(xbObj.toString()); - } - } - Object zghObj = map.get("zgh"); - if (zghObj != null) { - qgzxTeacher.setEmployeeId(zghObj.toString()); - } - //学院id - Object yxdmObj = map.get("yxdm"); - if (yxdmObj!=null) { - Long ksh = qgzxTeacherMapper.selectDeptCode(yxdmObj.toString()); - if (ksh != null) { - qgzxTeacher.setDeptId(ksh); - } - } - qgzxTeacher.setUpdateTime(DateUtils.getNowDate()); - updateSrsStudent.add(qgzxTeacher); - } - /*if (updateSrsStudent.size()!=0) { - List> lists = ListSliceUtil.updateSlice(updateSrsStudent); - if (lists != null) { - for (List studentList : lists) { - cphTeacherMapper.updateSrsClassList(studentList); - } - } - }*/ - - } diff --git a/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java b/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java index 6101a69..e906b9e 100644 --- a/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java +++ b/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java @@ -20,6 +20,7 @@ public interface QgzxTeacherMapper extends BaseMapper { * @return 教职工信息 */ public QgzxTeacher selectQgzxTeacherByTeacherId(Long teacherId); + public QgzxTeacher selectQgzxTeacherByEmployeeId(String employeeId); /** * 查询教职工信息列表 diff --git a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml index 140925a..c706ab0 100644 --- a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml +++ b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml @@ -47,6 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dept as a where dept_code = #{ksh} + insert into qgzx_teacher