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 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E8=81=8C?= =?UTF-8?q?=E5=B7=A5=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 From 5235790c6e99cee175c3213892b4a802540dd571 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 12 Sep 2025 06:04:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E8=81=8C?= =?UTF-8?q?=E5=B7=A5=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 --- .../service/impl/CphTeacherServiceImpl.java | 8 ++++---- .../com/srs/system/mapper/QgzxTeacherMapper.java | 1 + .../resources/mapper/system/QgzxTeacherMapper.xml | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) 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 0eb78b7..e89ed43 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 @@ -468,9 +468,9 @@ public class CphTeacherServiceImpl implements ICphTeacherService String zgh = (String) map.get("zgh"); String xm=(String) map.get("xm"); String xb=(String) map.get("xb"); - String yxdm=(String) map.get("yxdm"); + String ksh=(String) map.get("ksh"); QgzxTeacher qgzxTeacher = qgzxTeacherMapper.selectQgzxTeacherByEmployeeId(zgh); - Long deptId = qgzxTeacherMapper.selectDeptCode(yxdm); + Long deptId = qgzxTeacherMapper.selectDeptCode(ksh); QgzxTeacher entity=new QgzxTeacher(); entity.setEmployeeId(zgh); entity.setName(xm); @@ -483,8 +483,8 @@ public class CphTeacherServiceImpl implements ICphTeacherService if(qgzxTeacher==null){ qgzxTeacherMapper.insertQgzxTeacher(entity); }else{ - entity.setTeacherId(qgzxTeacher.getTeacherId()); - qgzxTeacherMapper.updateQgzxTeacher(entity); + entity.setEmployeeId(zgh); + qgzxTeacherMapper.updateQgzxTeacherNew(entity); } } 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 e906b9e..75680b4 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 @@ -45,6 +45,7 @@ public interface QgzxTeacherMapper extends BaseMapper { * @return 结果 */ int updateQgzxTeacher(QgzxTeacher qgzxTeacher); + int updateQgzxTeacherNew(QgzxTeacher qgzxTeacher); /** * 删除教职工信息 diff --git a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml index c706ab0..7da8eb0 100644 --- a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml +++ b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml @@ -108,6 +108,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where teacher_id = #{teacherId} + + update qgzx_teacher + + name = #{name}, + gender = #{gender}, + age = #{age}, + dept_id = #{deptId}, + phone_number = #{phoneNumber}, + status = #{status}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where employee_id = #{employeeId} + + delete from qgzx_teacher where teacher_id = #{teacherId} From c662e812e7175dcb4d2ec2afe1be48434183abc8 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 12 Sep 2025 15:11:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=BE=BE=E6=A0=87=E9=87=8F=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherEvaluationStatusController.java | 14 +++++++++++++- .../domain/TeacherEvaluationStatus.java | 15 +++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java index bc0e3ff..243445a 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java @@ -47,11 +47,23 @@ public class TeacherEvaluationStatusController extends BaseController { /** * 导出辅导员综合评价状态列表 */ - @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:export')") +// @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:export')") @Log(title = "辅导员综合评价状态", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TeacherEvaluationStatus teacherEvaluationStatus) { List list = teacherEvaluationStatusService.selectTeacherEvaluationStatusList(teacherEvaluationStatus); + for (TeacherEvaluationStatus entity : list){ + if(entity.getIsCompleted()){ + entity.setCompleted("是"); + }else{ + entity.setCompleted("否"); + } + if(entity.getScoreImported()){ + entity.setIsScoreImported("是"); + }else{ + entity.setIsScoreImported("否"); + } + } ExcelUtil util = new ExcelUtil(TeacherEvaluationStatus.class); util.exportExcel(response, list, "辅导员综合评价状态数据"); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java index d8cf1cc..1dd2aa0 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java @@ -8,7 +8,7 @@ import lombok.Data; /** * 辅导员综合评价状态对象 teacher_evaluation_status - * + * * @author srs * @date 2024-01-20 */ @@ -53,19 +53,26 @@ public class TeacherEvaluationStatus extends BaseEntity { private String stuYearName; /** 是否完成综合测评 */ - @Excel(name = "是否完成综合测评") private Boolean isCompleted; + /** 是否完成综合测评 */ + @Excel(name = "是否完成综合测评") + private String completed; + /** 待办事项数量 */ @Excel(name = "待办事项数量") @TableField(exist = false) private Integer todoCount; /** 成绩是否已导入 */ - @Excel(name = "成绩是否已导入") @TableField(exist = false) private Boolean scoreImported; + /** 成绩是否已导入 */ + @Excel(name = "成绩是否已导入") + @TableField(exist = false) + private String isScoreImported; + /** 备注 */ @Excel(name = "备注") private String remarks; @@ -177,4 +184,4 @@ public class TeacherEvaluationStatus extends BaseEntity { public void setLastUpdateTime(String lastUpdateTime) { this.lastUpdateTime = lastUpdateTime; } -} \ No newline at end of file +} From 9f0ba8a9df6776db33567b94e2beaac0d9748cb4 Mon Sep 17 00:00:00 2001 From: 18154758993 <605281283@qq.com> Date: Fri, 12 Sep 2025 15:58:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=8A=A5=E5=88=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/stureg/SrsStuRegMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml index f017866..5947c4b 100644 --- a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml +++ b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml @@ -77,11 +77,11 @@ and a.ZZMM = #{ZZMM} and a.MZ = #{MZ} and a.XH = #{XH} - and a.XY = #{XY} + and a.XY like concat('%', #{XY}, '%') and a.XYDM = #{XYDM} and a.ZY = #{ZY} and a.ZYDM = #{ZYDM} - and a.BJ = #{BJ} + and a.BJ like concat('%',#{BJ}, '%') and a.BJDM = #{BJDM} and a.last_school = #{lastSchool} and a.last_school_addr = #{lastSchoolAddr} @@ -650,7 +650,7 @@ select a.*,b.class_name,f.major_name,g.dept_name, case e.room_no is NULL when true then "无" - else concat(e.park_name,' ',e.building_name,' ',e.room_no) end as dorm + else concat(e.park_name,' ',e.building_name,' ',e.room_no) end as dorm,a.is_smoke,a.is_early,a.hobby from srs_stu_reg as a left join srs_class as b on a.BJDM = b.class_code left join cph_teacher as c on b.teacher_id = c.teacher_id From 03ee3e6e9fee6ebc0ba46ffb2c26f36aeb502ebb Mon Sep 17 00:00:00 2001 From: 18154758993 <605281283@qq.com> Date: Fri, 12 Sep 2025 17:44:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=8A=A5=E5=88=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srs-quartz/src/main/java/com/srs/quartz/task/RegTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srs-quartz/src/main/java/com/srs/quartz/task/RegTask.java b/srs-quartz/src/main/java/com/srs/quartz/task/RegTask.java index af87264..f8ebb00 100644 --- a/srs-quartz/src/main/java/com/srs/quartz/task/RegTask.java +++ b/srs-quartz/src/main/java/com/srs/quartz/task/RegTask.java @@ -27,9 +27,9 @@ public class RegTask { srsStuCheck.setIsCheck(m.getIsCheck()); srsStuCheck.setKsh(m.getKsh()); srsStuCheck.setCheckTime(m.getCheckTime()); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("ksh",m.getKsh()); - checkService.update(srsStuCheck,updateWrapper); +// UpdateWrapper updateWrapper = new UpdateWrapper<>(); +// updateWrapper.eq("ksh",m.getKsh()); + checkService.saveOrUpdate(srsStuCheck); } }