From 1ef1bb05aba153d11b6703fa3e3ada5f68efd8ae Mon Sep 17 00:00:00 2001 From: MDSMO Date: Thu, 28 Aug 2025 15:10:01 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E5=AF=9D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dormitory/DmsDormitoryCheckMapper.xml | 26 ++++++++++++++----- .../DmsDormitoryCheckController.java | 3 +-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsDormitoryCheckMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsDormitoryCheckMapper.xml index e2e6bb4..88eed0b 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsDormitoryCheckMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsDormitoryCheckMapper.xml @@ -93,18 +93,30 @@ - - \ No newline at end of file + diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryCheckController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryCheckController.java index ae5acb8..6d826d3 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryCheckController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryCheckController.java @@ -39,7 +39,7 @@ public class DmsDormitoryCheckController extends BaseController { private IDmsDormitoryCheckService dmsDormitoryCheckService; - + @PostMapping("/sendMail/{checkId}") @@ -52,7 +52,6 @@ public class DmsDormitoryCheckController extends BaseController { @GetMapping("/listDorm") @ApiOperation("列出宿舍") public TableDataInfo listDorm(DmsSearch param){ - startPage(); List> list = dmsDormitoryCheckService.listDorm(param); list.forEach(x->{ x.put("dorm_name",x.get("park_name").toString()+x.get("building_name").toString()+x.get("room_no").toString()); From 20385e30849fc43337004949a6396d8e04a86f31 Mon Sep 17 00:00:00 2001 From: MDSMO Date: Fri, 29 Aug 2025 19:47:15 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E7=BB=BC=E5=90=88=E7=B4=A0=E8=B4=A8?= =?UTF-8?q?=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherEvaluationStatusController.java | 144 ++++++++++++++ .../domain/TeacherEvaluationStatus.java | 180 ++++++++++++++++++ .../mapper/TeacherEvaluationStatusMapper.java | 92 +++++++++ .../ITeacherEvaluationStatusService.java | 104 ++++++++++ .../TeacherEvaluationStatusServiceImpl.java | 147 ++++++++++++++ .../TeacherEvaluationStatusMapper.xml | 90 +++++++++ 6 files changed, 757 insertions(+) create mode 100644 srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/TeacherEvaluationStatusMapper.java create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/service/ITeacherEvaluationStatusService.java create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/TeacherEvaluationStatusServiceImpl.java create mode 100644 srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml 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 new file mode 100644 index 0000000..bc0e3ff --- /dev/null +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java @@ -0,0 +1,144 @@ +package com.srs.comprehensive.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.srs.common.annotation.Log; +import com.srs.common.core.controller.BaseController; +import com.srs.common.core.domain.AjaxResult; +import com.srs.common.enums.BusinessType; +import com.srs.comprehensive.domain.TeacherEvaluationStatus; +import com.srs.comprehensive.service.ITeacherEvaluationStatusService; +import com.srs.common.utils.poi.ExcelUtil; +import com.srs.common.core.page.TableDataInfo; + +/** + * 辅导员综合评价状态Controller + * + * @author srs + * @date 2024-01-20 + */ +@RestController +@RequestMapping("/comprehensive/teacherEvaluationStatus") +public class TeacherEvaluationStatusController extends BaseController { + @Autowired + private ITeacherEvaluationStatusService teacherEvaluationStatusService; + + /** + * 查询辅导员综合评价状态列表 + */ + @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:list')") + @GetMapping("/list") + public TableDataInfo list(TeacherEvaluationStatus teacherEvaluationStatus) { + startPage(); + List list = teacherEvaluationStatusService.selectTeacherEvaluationStatusList(teacherEvaluationStatus); + return getDataTable(list); + } + + /** + * 导出辅导员综合评价状态列表 + */ + @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); + ExcelUtil util = new ExcelUtil(TeacherEvaluationStatus.class); + util.exportExcel(response, list, "辅导员综合评价状态数据"); + } + + /** + * 获取辅导员综合评价状态详细信息 + */ + @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(teacherEvaluationStatusService.selectTeacherEvaluationStatusById(id)); + } + + /** + * 新增辅导员综合评价状态 + */ + @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:add')") + @Log(title = "辅导员综合评价状态", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TeacherEvaluationStatus teacherEvaluationStatus) { + return toAjax(teacherEvaluationStatusService.insertTeacherEvaluationStatus(teacherEvaluationStatus)); + } + + /** + * 修改辅导员综合评价状态 + */ + @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:edit')") + @Log(title = "辅导员综合评价状态", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TeacherEvaluationStatus teacherEvaluationStatus) { + return toAjax(teacherEvaluationStatusService.updateTeacherEvaluationStatus(teacherEvaluationStatus)); + } + + /** + * 删除辅导员综合评价状态 + */ + @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:remove')") + @Log(title = "辅导员综合评价状态", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(teacherEvaluationStatusService.deleteTeacherEvaluationStatusByIds(ids)); + } + + /** + * 查询辅导员待办事项数量 + */ + @GetMapping("/todoCount") + public AjaxResult getTodoCount(Long teacherId, Long stuYearId) { + Integer count = teacherEvaluationStatusService.selectTodoCountByTeacherAndYear(teacherId, stuYearId); + return success(count); + } + + /** + * 查询综合评价成绩导入状态 + */ + @GetMapping("/scoreImportStatus") + public AjaxResult getScoreImportStatus(Long teacherId, Long stuYearId) { + Boolean status = teacherEvaluationStatusService.selectScoreImportStatusByTeacherAndYear(teacherId, stuYearId); + return success(status); + } + + /** + * 获取所有辅导员基本信息 + */ + @GetMapping("/allTeachers") + public AjaxResult getAllTeachers() { + List list = teacherEvaluationStatusService.selectAllTeachers(); + return success(list); + } + + /** + * 根据条件查询辅导员综合评价状态 + */ + @GetMapping("/condition") + public TableDataInfo getByCondition(Long deptId, String teacherName, String employeeId, Long stuYearId) { + startPage(); + List list = teacherEvaluationStatusService.selectTeacherEvaluationStatusByCondition( + deptId, teacherName, employeeId, stuYearId); + return getDataTable(list); + } + + /** + * 获取学院列表 + */ + @GetMapping("/deptList") + public AjaxResult getDeptList() { + List> list = teacherEvaluationStatusService.selectDeptNameList(); + return success(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 new file mode 100644 index 0000000..d8cf1cc --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java @@ -0,0 +1,180 @@ +package com.srs.comprehensive.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.srs.common.annotation.Excel; +import com.srs.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 辅导员综合评价状态对象 teacher_evaluation_status + * + * @author srs + * @date 2024-01-20 + */ +@Data +@TableName("teacher_evaluation_status") +public class TeacherEvaluationStatus extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 辅导员ID */ + @Excel(name = "辅导员ID") + private Long teacherId; + + /** 辅导员姓名 */ + @Excel(name = "辅导员姓名") + @TableField(exist = false) + private String teacherName; + + /** 工号 */ + @Excel(name = "工号") + @TableField(exist = false) + private String employeeId; + + /** 学院ID */ + @Excel(name = "学院ID") + private Long deptId; + + /** 学院名称 */ + @Excel(name = "学院名称") + @TableField(exist = false) + private String deptName; + + /** 学年ID */ + @Excel(name = "学年ID") + private Long stuYearId; + + /** 学年名称 */ + @Excel(name = "学年名称") + @TableField(exist = false) + private String stuYearName; + + /** 是否完成综合测评 */ + @Excel(name = "是否完成综合测评") + private Boolean isCompleted; + + /** 待办事项数量 */ + @Excel(name = "待办事项数量") + @TableField(exist = false) + private Integer todoCount; + + /** 成绩是否已导入 */ + @Excel(name = "成绩是否已导入") + @TableField(exist = false) + private Boolean scoreImported; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 最后更新时间 */ + @Excel(name = "最后更新时间") + private String lastUpdateTime; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTeacherId() { + return teacherId; + } + + public void setTeacherId(Long teacherId) { + this.teacherId = teacherId; + } + + public String getTeacherName() { + return teacherName; + } + + public void setTeacherName(String teacherName) { + this.teacherName = teacherName; + } + + public String getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(String employeeId) { + this.employeeId = employeeId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public Long getStuYearId() { + return stuYearId; + } + + public void setStuYearId(Long stuYearId) { + this.stuYearId = stuYearId; + } + + public String getStuYearName() { + return stuYearName; + } + + public void setStuYearName(String stuYearName) { + this.stuYearName = stuYearName; + } + + public Boolean getIsCompleted() { + return isCompleted; + } + + public void setIsCompleted(Boolean isCompleted) { + this.isCompleted = isCompleted; + } + + public Integer getTodoCount() { + return todoCount; + } + + public void setTodoCount(Integer todoCount) { + this.todoCount = todoCount; + } + + public Boolean getScoreImported() { + return scoreImported; + } + + public void setScoreImported(Boolean scoreImported) { + this.scoreImported = scoreImported; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getLastUpdateTime() { + return lastUpdateTime; + } + + public void setLastUpdateTime(String lastUpdateTime) { + this.lastUpdateTime = lastUpdateTime; + } +} \ No newline at end of file diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/TeacherEvaluationStatusMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/TeacherEvaluationStatusMapper.java new file mode 100644 index 0000000..91b78d4 --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/TeacherEvaluationStatusMapper.java @@ -0,0 +1,92 @@ +package com.srs.comprehensive.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.srs.comprehensive.domain.TeacherEvaluationStatus; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * 辅导员综合评价状态Mapper接口 + * + * @author srs + * @date 2024-01-20 + */ +@Mapper +public interface TeacherEvaluationStatusMapper extends BaseMapper { + + /** + * 查询辅导员综合评价状态列表 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 辅导员综合评价状态集合 + */ + List selectTeacherEvaluationStatusList(TeacherEvaluationStatus teacherEvaluationStatus); + + /** + * 查询辅导员待办事项数量 + * + * @param teacherId 辅导员ID + * @param stuYearId 学年ID + * @return 待办事项数量 + */ + @Select("SELECT COUNT(*) FROM cph_audit_details cad " + + "LEFT JOIN cph_teacher ct ON cad.reviewed_by_id = ct.teacher_id " + + "LEFT JOIN srs_stu_year ssy ON ssy.id = #{stuYearId} " + + "WHERE ct.teacher_id = #{teacherId} " + + "AND cad.status_code IN (1, 2) " + + "AND cad.create_time >= ssy.start_time " + + "AND cad.create_time <= ssy.end_time") + Integer selectTodoCountByTeacherAndYear(@Param("teacherId") Long teacherId, @Param("stuYearId") Long stuYearId); + + /** + * 查询综合评价成绩导入状态 + * + * @param teacherId 辅导员ID + * @param stuYearId 学年ID + * @return 是否已导入成绩 + */ + @Select("SELECT COUNT(*) > 0 FROM srs_ce_score scs " + + "LEFT JOIN srs_student ss ON scs.stu_id = ss.stu_id " + + "LEFT JOIN srs_class sc ON ss.class_id = sc.class_id " + + "LEFT JOIN cph_teacher ct ON sc.teacher_id = ct.teacher_id " + + "WHERE ct.teacher_id = #{teacherId} " + + "AND scs.stu_year_id = #{stuYearId}") + Boolean selectScoreImportStatusByTeacherAndYear(@Param("teacherId") Long teacherId, @Param("stuYearId") Long stuYearId); + + /** + * 获取所有辅导员基本信息 + * + * @return 辅导员列表 + */ + @Select("SELECT ct.teacher_id, ct.name as teacher_name, ct.employee_id, " + + "ct.dept_id, sd.dept_name " + + "FROM cph_teacher ct " + + "LEFT JOIN sys_dept sd ON ct.dept_id = sd.dept_id ") + List selectAllTeachers(); + + /** + * 根据条件查询辅导员综合评价状态 + * + * @param deptId 学院ID + * @param teacherName 辅导员姓名 + * @param employeeId 工号 + * @param stuYearId 学年ID + * @return 辅导员综合评价状态列表 + */ + List selectTeacherEvaluationStatusByCondition( + @Param("deptId") Long deptId, + @Param("teacherName") String teacherName, + @Param("employeeId") String employeeId, + @Param("stuYearId") Long stuYearId + ); + + /** + * 查询学院名称列表 + * + * @return 学院列表 + */ + List> selectDeptNameList(); +} diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ITeacherEvaluationStatusService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ITeacherEvaluationStatusService.java new file mode 100644 index 0000000..30c5311 --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ITeacherEvaluationStatusService.java @@ -0,0 +1,104 @@ +package com.srs.comprehensive.service; + +import com.srs.comprehensive.domain.TeacherEvaluationStatus; +import java.util.List; + +/** + * 辅导员综合评价状态Service接口 + * + * @author srs + * @date 2024-01-20 + */ +public interface ITeacherEvaluationStatusService { + /** + * 查询辅导员综合评价状态 + * + * @param id 辅导员综合评价状态主键 + * @return 辅导员综合评价状态 + */ + public TeacherEvaluationStatus selectTeacherEvaluationStatusById(Long id); + + /** + * 查询辅导员综合评价状态列表 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 辅导员综合评价状态集合 + */ + public List selectTeacherEvaluationStatusList(TeacherEvaluationStatus teacherEvaluationStatus); + + /** + * 新增辅导员综合评价状态 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 结果 + */ + public int insertTeacherEvaluationStatus(TeacherEvaluationStatus teacherEvaluationStatus); + + /** + * 修改辅导员综合评价状态 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 结果 + */ + public int updateTeacherEvaluationStatus(TeacherEvaluationStatus teacherEvaluationStatus); + + /** + * 批量删除辅导员综合评价状态 + * + * @param ids 需要删除的辅导员综合评价状态主键集合 + * @return 结果 + */ + public int deleteTeacherEvaluationStatusByIds(Long[] ids); + + /** + * 删除辅导员综合评价状态信息 + * + * @param id 辅导员综合评价状态主键 + * @return 结果 + */ + public int deleteTeacherEvaluationStatusById(Long id); + + /** + * 查询辅导员待办事项数量 + * + * @param teacherId 辅导员ID + * @param stuYearId 学年ID + * @return 待办事项数量 + */ + public Integer selectTodoCountByTeacherAndYear(Long teacherId, Long stuYearId); + + /** + * 查询综合评价成绩导入状态 + * + * @param teacherId 辅导员ID + * @param stuYearId 学年ID + * @return 是否已导入成绩 + */ + public Boolean selectScoreImportStatusByTeacherAndYear(Long teacherId, Long stuYearId); + + /** + * 获取所有辅导员基本信息 + * + * @return 辅导员列表 + */ + public List selectAllTeachers(); + + /** + * 根据条件查询辅导员综合评价状态 + * + * @param deptId 学院ID + * @param teacherName 辅导员姓名 + * @param employeeId 工号 + * @param stuYearId 学年ID + * @return 辅导员综合评价状态列表 + */ + public List selectTeacherEvaluationStatusByCondition( + Long deptId, String teacherName, String employeeId, Long stuYearId); + + /** + * 查询学院名称列表 + * + * @return 学院列表 + */ + public List> selectDeptNameList(); +} diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/TeacherEvaluationStatusServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/TeacherEvaluationStatusServiceImpl.java new file mode 100644 index 0000000..582080f --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/TeacherEvaluationStatusServiceImpl.java @@ -0,0 +1,147 @@ +package com.srs.comprehensive.service.impl; + +import java.util.Arrays; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.srs.comprehensive.mapper.TeacherEvaluationStatusMapper; +import com.srs.comprehensive.domain.TeacherEvaluationStatus; +import com.srs.comprehensive.service.ITeacherEvaluationStatusService; + +/** + * 辅导员综合评价状态Service业务层处理 + * + * @author srs + * @date 2024-01-20 + */ +@Service +public class TeacherEvaluationStatusServiceImpl implements ITeacherEvaluationStatusService { + @Autowired + private TeacherEvaluationStatusMapper teacherEvaluationStatusMapper; + + /** + * 查询辅导员综合评价状态 + * + * @param id 辅导员综合评价状态主键 + * @return 辅导员综合评价状态 + */ + @Override + public TeacherEvaluationStatus selectTeacherEvaluationStatusById(Long id) { + return teacherEvaluationStatusMapper.selectById(id); + } + + /** + * 查询辅导员综合评价状态列表 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 辅导员综合评价状态 + */ + @Override + public List selectTeacherEvaluationStatusList(TeacherEvaluationStatus teacherEvaluationStatus) { + return teacherEvaluationStatusMapper.selectTeacherEvaluationStatusList(teacherEvaluationStatus); + } + + /** + * 新增辅导员综合评价状态 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 结果 + */ + @Override + public int insertTeacherEvaluationStatus(TeacherEvaluationStatus teacherEvaluationStatus) { + return teacherEvaluationStatusMapper.insert(teacherEvaluationStatus); + } + + /** + * 修改辅导员综合评价状态 + * + * @param teacherEvaluationStatus 辅导员综合评价状态 + * @return 结果 + */ + @Override + public int updateTeacherEvaluationStatus(TeacherEvaluationStatus teacherEvaluationStatus) { + return teacherEvaluationStatusMapper.updateById(teacherEvaluationStatus); + } + + /** + * 批量删除辅导员综合评价状态 + * + * @param ids 需要删除的辅导员综合评价状态主键 + * @return 结果 + */ + @Override + public int deleteTeacherEvaluationStatusByIds(Long[] ids) { + return teacherEvaluationStatusMapper.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 删除辅导员综合评价状态信息 + * + * @param id 辅导员综合评价状态主键 + * @return 结果 + */ + @Override + public int deleteTeacherEvaluationStatusById(Long id) { + return teacherEvaluationStatusMapper.deleteById(id); + } + + /** + * 查询辅导员待办事项数量 + * + * @param teacherId 辅导员ID + * @param stuYearId 学年ID + * @return 待办事项数量 + */ + @Override + public Integer selectTodoCountByTeacherAndYear(Long teacherId, Long stuYearId) { + return teacherEvaluationStatusMapper.selectTodoCountByTeacherAndYear(teacherId, stuYearId); + } + + /** + * 查询综合评价成绩导入状态 + * + * @param teacherId 辅导员ID + * @param stuYearId 学年ID + * @return 是否已导入成绩 + */ + @Override + public Boolean selectScoreImportStatusByTeacherAndYear(Long teacherId, Long stuYearId) { + return teacherEvaluationStatusMapper.selectScoreImportStatusByTeacherAndYear(teacherId, stuYearId); + } + + /** + * 获取所有辅导员基本信息 + * + * @return 辅导员列表 + */ + @Override + public List selectAllTeachers() { + return teacherEvaluationStatusMapper.selectAllTeachers(); + } + + /** + * 根据条件查询辅导员综合评价状态 + * + * @param deptId 学院ID + * @param teacherName 辅导员姓名 + * @param employeeId 工号 + * @param stuYearId 学年ID + * @return 辅导员综合评价状态列表 + */ + @Override + public List selectTeacherEvaluationStatusByCondition( + Long deptId, String teacherName, String employeeId, Long stuYearId) { + return teacherEvaluationStatusMapper.selectTeacherEvaluationStatusByCondition( + deptId, teacherName, employeeId, stuYearId); + } + + /** + * 查询学院名称列表 + * + * @return 学院列表 + */ + @Override + public List> selectDeptNameList() { + return teacherEvaluationStatusMapper.selectDeptNameList(); + } +} diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml new file mode 100644 index 0000000..c0107f8 --- /dev/null +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + select t.teacher_id, t.name as teacher_name, t.employee_id, + t.dept_id, d.dept_name, + y.id as stu_year_id, y.stu_year_name, + CASE + WHEN (COALESCE(todo_count.cnt, 0) = 0) AND (COALESCE(score_count.cnt, 0) > 0) + THEN 1 + ELSE 0 + END as is_completed, + COALESCE(todo_count.cnt, 0) as todo_count, + CASE WHEN COALESCE(score_count.cnt, 0) > 0 THEN 1 ELSE 0 END as score_imported + from cph_teacher t + left join sys_dept d on t.dept_id = d.dept_id + left join srs_stu_year y on 1=1 + left join ( + select c.teacher_id, COUNT(*) as cnt, ci.stu_year_id as year_id + from cph_audit_details cad + inner join cph_iam ci on cad.project_id = ci.id + inner join srs_student s on cad.submitter_id = s.stu_id + inner join srs_class c on s.class_id = c.class_id + where cad.status_code in (1, 2) + group by c.teacher_id, ci.stu_year_id + ) todo_count on t.teacher_id = todo_count.teacher_id and y.id = todo_count.year_id + left join ( + select c.teacher_id, sc.stu_year_id, COUNT(*) as cnt + from srs_class c + inner join srs_student s on c.class_id = s.class_id + inner join srs_ce_score sc on s.stu_id = sc.stu_id + group by c.teacher_id, sc.stu_year_id + ) score_count on t.teacher_id = score_count.teacher_id and y.id = score_count.stu_year_id + + + + + + + + + + + + From a9623e3d278b53aa4543f0ddac0023e4a22b46ba Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 29 Aug 2025 21:50:02 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E5=B7=A5?= =?UTF-8?q?=E5=A4=A7=E5=B1=8FBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/comprehensive/SrsStudentMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml index afba5a4..b877003 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml @@ -441,12 +441,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT d.user_id userId, d.dept_id deptId, d.user_name userName, d.nick_name nickName FROM srs_student a @@ -58,6 +57,68 @@ where leave_application_id = #{leaveApplicationId} + + + + + + + + + + + + + + + + + + insert into cph_msg + + sender, + receiver, + content, + create_by, + create_time, + update_by, + update_time, + + + #{sender}, + #{receiver}, + #{content}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + update rt_stu_leave_application @@ -86,4 +147,10 @@ where leave_application_id = #{leaveApplicationId} + + + + delete from cph_msg where id = #{id} + + \ No newline at end of file diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuLeaveApplicationServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuLeaveApplicationServiceImpl.java index bd7fea6..5d30587 100644 --- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuLeaveApplicationServiceImpl.java +++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuLeaveApplicationServiceImpl.java @@ -175,7 +175,8 @@ public class RtStuLeaveApplicationServiceImpl extends ServiceImpl Date: Sun, 31 Aug 2025 19:27:53 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/srs/flowable/listener/BoStartListener.java | 7 ++++--- .../java/com/srs/flowable/listener/CounselorListener.java | 4 ++-- .../java/com/srs/flowable/listener/LeadAuditListener.java | 4 ++-- .../java/com/srs/flowable/listener/LeadEentListener.java | 5 +++-- .../java/com/srs/flowable/listener/LeadStartListener.java | 5 +++-- .../com/srs/flowable/listener/LeaveApproveListener.java | 4 ++-- .../srs/flowable/listener/LeaveStartApproveListener.java | 5 +++-- .../com/srs/flowable/listener/SecondaryLeaderListener.java | 6 +++--- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java index e5b1fcd..5d653e4 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java @@ -17,6 +17,7 @@ import java.util.List; /** * 二级学院书记审批或学生销假开始监听器 + * 邵政文 */ @Component @Slf4j @@ -72,7 +73,7 @@ public class BoStartListener implements ExecutionListener { //向企业微信发消息 TeacherVo updateDeptId = leaveMapper.getUpdateDeptId(approval); // 步骤 2: 使用updateDeptId.getUserName()获取辅导员工号 - String userName = "2023429227"; + String userName = updateDeptId.getUserName(); // 获取向企业微信发通知的工具类 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class); @@ -114,7 +115,7 @@ public class BoStartListener implements ExecutionListener { log.info("添加成功{}", res); //向企业微信发消息 // 步骤 2: 使用shenUserInfo.getUserName()获取辅导员工号 - String userName = "2023429227"; + String userName = shenUserInfo.getUserName(); // 获取向企业微信发通知的工具类 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class); @@ -123,7 +124,7 @@ public class BoStartListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向请假人(userName:{})发送企业微信请假审批通知。", userName); } } diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java index 07bd507..668b3f0 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java @@ -60,7 +60,7 @@ public class CounselorListener implements ExecutionListener { log.info("查询辅导员信息：{}", teacherInfo.getUserName()); log.info("请假人id：{}", stuId); //辅导员工号teacherInfo.getUserName() - String userName = "2023429227"; + String userName = teacherInfo.getUserName(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -93,7 +93,7 @@ public class CounselorListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向辅导员(userName:{})发送企业微信销假通知。", userName); } else { diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java index 3ae4d1a..378b040 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java @@ -78,7 +78,7 @@ public class LeadAuditListener implements ExecutionListener { log.info("请假人数据为：{}", stuLeaveApplication); log.info("审批结果为：{}", approval); // 步骤 2: 发送消息的接收人stuLeaveApplication.getCreateBy() - String userName = "2023429227"; + String userName = stuLeaveApplication.getCreateBy(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -144,7 +144,7 @@ public class LeadAuditListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向辅导员(userName:{})发送企业微信销假通知。", userName); log.info("已成功向送企业微信销假通知。{}", stuLeaveApplication.getStuId()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java index d66092a..e942d72 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java @@ -20,6 +20,7 @@ import java.util.List; /** * 领导审核 + * 邵政文 */ @Component @Slf4j @@ -74,7 +75,7 @@ public class LeadEentListener implements ExecutionListener { log.info("审批结果为：{}", approval); log.info("校领导信息为：{}", lingDataInfo); // 步骤 2: 使用lingDataInfo.get(0).getUserId()向校领导发送信息 - String userName = "2023429227"; + String userName = lingDataInfo.get(0).getUserName(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -107,7 +108,7 @@ public class LeadEentListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向辅导员(userName:{})发送企业微信销假通知。", userName); log.info("已成功向送企业微信销假通知。{}", stuLeaveApplication.getStuId()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java index bcbc4ba..e1ff947 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java @@ -18,6 +18,7 @@ import java.util.List; /** * 获取该二级学院书记所在的学工信息 + * 邵政文 */ @Component @Slf4j @@ -51,7 +52,7 @@ public class LeadStartListener implements ExecutionListener { try { log.info("学工收到二级学院书记发送过来的通知"); // 步骤 2: 使用updateDeptIdInfo.get(0).getUserId()获取学工工号 - String userName = "2023429227"; + String userName = updateDeptIdInfo.get(0).getUserName(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -84,7 +85,7 @@ public class LeadStartListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向辅导员(userName:{})发送企业微信请假审批通知。", userName); log.info("已成功向送企业微信审批通知。{}", updateDeptIdInfo.get(0).getUserName()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java index b625560..037883f 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java @@ -78,7 +78,7 @@ public class LeaveApproveListener implements ExecutionListener { int leaveDay = leaveDays.intValue(); if(leaveDay >= 1 && leaveDay <= 3) { // 步骤 2: 使用stuLeaveApplication.getCreateBy()向请假人发送销假消息 - String userName = "2023429227"; + String userName = stuLeaveApplication.getCreateBy(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -108,7 +108,7 @@ public class LeaveApproveListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); // 发送消息的方法 + weChatUtil.sendTextMessage(userName, content); // 发送消息的方法 log.info("已成功向请假人({})发送企业微信销假通知。", userName); log.info("发件人id。{}", stuLeaveApplication.getStuId()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java index f02dede..d5cbc3c 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java @@ -16,6 +16,7 @@ import java.math.BigDecimal; /** * 获取该生所在辅导员信息 + * 邵政文 */ @Component @Slf4j @@ -51,7 +52,7 @@ public class LeaveStartApproveListener implements ExecutionListener { try { log.info("辅导员收到请假人发送过来的通知"); // 步骤 2: 使用secondaryLeaderInfo.getUserName()获取辅导员工号 - String userName = "2023429227"; + String userName = secondaryLeaderInfo.getUserName(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -83,7 +84,7 @@ public class LeaveStartApproveListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向辅导员(userName:{})发送企业微信请假审批通知。", userName); log.info("已成功向送企业微信审批通知。{}", secondaryLeaderInfo.getUserName()); log.info("请假人id：{}", stuLeaveApplication.getStuId()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java index 4df29a0..43d0b1f 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java @@ -36,7 +36,7 @@ public class SecondaryLeaderListener implements ExecutionListener { // 获取请假天数 BigDecimal leaveDays = (BigDecimal) delegateExecution.getVariable("leaveDays"); - // 获取高辅导员 + // 获取二级学院书记用户信息 //TeacherVo secondaryLeaderInfo = leaveMapper.getSecondaryLeaderInfo(deptId); //delegateExecution.setVariable("approval", secondaryLeaderInfo.getUserId()); List secondaryLeaderInfo = leaveMapper.getSecondaryLeaderInfo(deptId); @@ -53,7 +53,7 @@ public class SecondaryLeaderListener implements ExecutionListener { try { //int leaveDay = leaveDays.intValue(); // 步骤 2: 使用secondaryLeaderInfo.get(0).getUserName()获取二级学院书记工号 - String userName = "2023429227"; + String userName = secondaryLeaderInfo.get(0).getUserName(); // 步骤 3: 检查是否成功获取到 userName if (userName != null && !userName.isEmpty()) { @@ -120,7 +120,7 @@ public class SecondaryLeaderListener implements ExecutionListener { String content = "您有待处理任务，请点击前往处理"; // 步骤 4: 使用 userName 作为接收人发送消息 - //weChatUtil.sendTextMessage(userName, content); + weChatUtil.sendTextMessage(userName, content); log.info("已成功向二级学院书记(userName:{})发送企业微信请假审批通知。", userName); log.info("已成功向此人{}送企业微信审批通知。", secondaryLeaderInfo.get(0).getUserName()); From bace8d44f9edda2dcd206f660d65759a1dde868e Mon Sep 17 00:00:00 2001 From: ningbo <3301955438@qq.com> Date: Mon, 1 Sep 2025 14:49:44 +0800 Subject: [PATCH 06/29] =?UTF-8?q?feat(flowable):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8D=AB=E7=94=9F=E6=89=80=E5=92=8C=E5=BF=83=E7=90=86=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=9A=84=E9=80=9A=E7=9F=A5=E7=9B=91=E5=90=AC=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 WSSListener 和 XLZXListener 类，用于向卫生所和心理中心发送违纪审批通知 - 更新 RtStuReentrySchoolServiceImpl 中的流程实例 ID - 优化 XWGSListener 类的注释 --- .../listener/disciplinary/WSSListener.java | 58 +++++++++++++++++++ .../listener/disciplinary/XLZXListener.java | 57 ++++++++++++++++++ .../listener/disciplinary/XWGSListener.java | 2 +- .../impl/RtStuReentrySchoolServiceImpl.java | 2 +- 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java create mode 100644 srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java new file mode 100644 index 0000000..92bc73d --- /dev/null +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java @@ -0,0 +1,58 @@ +package com.srs.flowable.listener.disciplinary; + +import com.srs.common.utils.WeChatUtil; +import com.srs.common.utils.spring.SpringUtils; +import com.srs.flowable.mapper.DisciplinaryMapper; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author 宁博 + */ +@Component +@Slf4j +public class WSSListener implements ExecutionListener { + @Override + public void notify(DelegateExecution delegateExecution) { + DisciplinaryMapper disciplinaryMapper = SpringUtils.getBean(DisciplinaryMapper.class); + + // 1. 【核心】定义"卫生所" wss + final String TARGET_ROLE_KEY = "wss"; + log.info("流程实例 [{}]: 准备向角色 '{}' 发送通知。", delegateExecution.getProcessInstanceId(), TARGET_ROLE_KEY); + + // 2. 根据这个固定的角色Key，查询该角色的所有成员ID（即使只有一个）。 + List userIdList = disciplinaryMapper.getApprovalByRoleKey(TARGET_ROLE_KEY); + // 3. 检查是否找到了成员。 + if (userIdList == null || userIdList.isEmpty()) { + log.error("根据角色Key '{}' 未找到任何用户，无法发送通知。", TARGET_ROLE_KEY); + return; // 中止执行，不抛出异常以免中断流程 + } + + // 4. 发送企业微信通知。 + // (我们的批量发送逻辑即使只有一个用户也能完美处理) + try { + // 批量查询userName (即使只有一个ID，这个方法也能正常工作) + List userNameList = disciplinaryMapper.getUserNamesByUserIdList(userIdList); + + if (!userNameList.isEmpty()) { + // 将列表拼接成 "username1|username2|..." 的格式 + String toUser = String.join("|", userNameList); + + WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class); + String content = "您有一条新的学生违纪审批任务待处理，请点击前往处理。"; + + weChatUtil.sendTextMessage(toUser, content); + log.info("已成功向角色 '{}' 的成员发送通知。接收人: {}", TARGET_ROLE_KEY, toUser); + } else { + log.warn("角色 '{}' 中找到了 {} 个用户，但无人配置企业微信账号，未发送任何通知。", TARGET_ROLE_KEY, userIdList.size()); + } + } catch (Exception e) { + log.error("向角色 '{}' 发送企业微信通知时出现异常。流程将继续。错误详情: {}", TARGET_ROLE_KEY, e.getMessage(), e); + } + } +} + diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java new file mode 100644 index 0000000..34058cd --- /dev/null +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java @@ -0,0 +1,57 @@ +package com.srs.flowable.listener.disciplinary; + +import com.srs.common.utils.WeChatUtil; +import com.srs.common.utils.spring.SpringUtils; +import com.srs.flowable.mapper.DisciplinaryMapper; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author 宁博 + */ +@Slf4j +@Component +public class XLZXListener implements ExecutionListener { + @Override + public void notify(DelegateExecution delegateExecution) { + DisciplinaryMapper disciplinaryMapper = SpringUtils.getBean(DisciplinaryMapper.class); + + // 1. 【核心】定义"心理中心" xlzx + final String TARGET_ROLE_KEY = "xlzx"; + log.info("流程实例 [{}]: 准备向角色 '{}' 发送通知。", delegateExecution.getProcessInstanceId(), TARGET_ROLE_KEY); + + // 2. 根据这个固定的角色Key，查询该角色的所有成员ID（即使只有一个）。 + List userIdList = disciplinaryMapper.getApprovalByRoleKey(TARGET_ROLE_KEY); + // 3. 检查是否找到了成员。 + if (userIdList == null || userIdList.isEmpty()) { + log.error("根据角色Key '{}' 未找到任何用户，无法发送通知。", TARGET_ROLE_KEY); + return; // 中止执行，不抛出异常以免中断流程 + } + + // 4. 发送企业微信通知。 + // (我们的批量发送逻辑即使只有一个用户也能完美处理) + try { + // 批量查询userName (即使只有一个ID，这个方法也能正常工作) + List userNameList = disciplinaryMapper.getUserNamesByUserIdList(userIdList); + + if (!userNameList.isEmpty()) { + // 将列表拼接成 "username1|username2|..." 的格式 + String toUser = String.join("|", userNameList); + + WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class); + String content = "您有一条新的学生违纪审批任务待处理，请点击前往处理。"; + + weChatUtil.sendTextMessage(toUser, content); + log.info("已成功向角色 '{}' 的成员发送通知。接收人: {}", TARGET_ROLE_KEY, toUser); + } else { + log.warn("角色 '{}' 中找到了 {} 个用户，但无人配置企业微信账号，未发送任何通知。", TARGET_ROLE_KEY, userIdList.size()); + } + } catch (Exception e) { + log.error("向角色 '{}' 发送企业微信通知时出现异常。流程将继续。错误详情: {}", TARGET_ROLE_KEY, e.getMessage(), e); + } + } +} diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java index 5345fb0..79cacd1 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; /** - * 根据辅导员的部门id，查询该部门的学无干事人员 知无涯 + * 根据辅导员的部门id，查询该部门的学务干事人员 知无涯 */ @Component @Slf4j diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuReentrySchoolServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuReentrySchoolServiceImpl.java index 18ad6cd..9f8ca9c 100644 --- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuReentrySchoolServiceImpl.java +++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuReentrySchoolServiceImpl.java @@ -178,7 +178,7 @@ public class RtStuReentrySchoolServiceImpl extends ServiceImpl Date: Sat, 6 Sep 2025 19:41:03 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/srs/stureg/domain/SrsStuReg.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java b/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java index 7851317..e38809c 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java +++ b/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java @@ -196,6 +196,15 @@ public class SrsStuReg extends BaseEntity @Excel(name = "残疾说明") @TableField("disable_descript") private String disableDescript; + @Excel(name = "是否吸烟") + @TableField("isSmoke") + public String isSmoke; + @Excel(name = "是否早睡") + @TableField("isEarly") + public String isEarly; + @Excel(name = "兴趣特长") + @TableField("hobby") + public String hobby; /** 注册状态 */ @Excel(name = "注册状态") @TableField("reg_status") @@ -223,12 +232,4 @@ public class SrsStuReg extends BaseEntity @TableField("TDCJ") private Double TDCJ; - @TableField("is_smoke") - public String isSmoke; - - @TableField("is_early") - public String isEarly; - - @TableField("hobby") - public String hobby; } From 6485b7acf2170520d96a8fe622f3f29cc57b80b1 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Sat, 6 Sep 2025 21:10:30 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stureg/SrsStuRegController.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java index cd9afdd..4632b15 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java @@ -247,6 +247,28 @@ public class SrsStuRegController extends BaseController public void export(HttpServletResponse response, SrsStuReg srsStuReg) { List list = srsStuRegService.selectSrsStuRegList(srsStuReg); + for(SrsStuReg entity:list){ + switch (entity.getRegStatus()){ + case "0": + entity.setRegStatus("未激活"); + break; + case "1": + entity.setRegStatus("已缴费"); + break; + case "2": + entity.setRegStatus("已激活带缴费"); + break; + case "3": + entity.setRegStatus("已报到"); + break; + case "4": + entity.setRegStatus("在校"); + break; + default: + entity.setRegStatus("未激活"); + break; + } + } ExcelUtil util = new ExcelUtil(SrsStuReg.class); util.exportExcel(response, list, "新生报到学生注册信息数据"); } From 15fb54dc10f7a4d43a7e1999da5ec339db0cef7e Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Sat, 6 Sep 2025 21:24:57 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stureg/SrsStuRegController.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java index 4632b15..2ba5169 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java @@ -268,6 +268,28 @@ public class SrsStuRegController extends BaseController entity.setRegStatus("未激活"); break; } + switch (entity.getIsLoan()){ + case "0": + entity.setIsLoan("否"); + break; + case "1": + entity.setIsLoan("是"); + break; + default: + entity.setIsLoan("否"); + break; + } + switch (entity.getIsDirection()){ + case "0": + entity.setIsDirection("否"); + break; + case "1": + entity.setIsDirection("是"); + break; + default: + entity.setIsDirection("否"); + break; + } } ExcelUtil util = new ExcelUtil(SrsStuReg.class); util.exportExcel(response, list, "新生报到学生注册信息数据"); From 28312eadc37646db5019655deb20b7614d8b6fe8 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Sat, 6 Sep 2025 21:53:55 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stureg/SrsStuRegController.java | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java index 2ba5169..b8e35b1 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java @@ -268,27 +268,31 @@ public class SrsStuRegController extends BaseController entity.setRegStatus("未激活"); break; } - switch (entity.getIsLoan()){ - case "0": - entity.setIsLoan("否"); - break; - case "1": - entity.setIsLoan("是"); - break; - default: - entity.setIsLoan("否"); - break; + if(entity.getIsLoan() != null) { + switch (entity.getIsLoan()) { + case "0": + entity.setIsLoan("否"); + break; + case "1": + entity.setIsLoan("是"); + break; + default: + entity.setIsLoan("否"); + break; + } } - switch (entity.getIsDirection()){ - case "0": - entity.setIsDirection("否"); - break; - case "1": - entity.setIsDirection("是"); - break; - default: - entity.setIsDirection("否"); - break; + if(entity.getIsDirection() != null) { + switch (entity.getIsDirection()) { + case "0": + entity.setIsDirection("否"); + break; + case "1": + entity.setIsDirection("是"); + break; + default: + entity.setIsDirection("否"); + break; + } } } ExcelUtil util = new ExcelUtil(SrsStuReg.class); From 77d6bc824c42283614aad59288095247c0d6797c Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sun, 7 Sep 2025 17:27:28 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=E4=BD=93=E6=B5=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/srs/common/utils/listFunc.java | 59 ++++++++++--------- .../service/impl/SrsSportTestServiceImpl.java | 13 ++-- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/srs-common/src/main/java/com/srs/common/utils/listFunc.java b/srs-common/src/main/java/com/srs/common/utils/listFunc.java index a3153d7..41d39c5 100644 --- a/srs-common/src/main/java/com/srs/common/utils/listFunc.java +++ b/srs-common/src/main/java/com/srs/common/utils/listFunc.java @@ -1,9 +1,6 @@ package com.srs.common.utils; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -29,37 +26,41 @@ public class listFunc { }).collect(Collectors.toList()); } - public static List subList(List actualList, List expectList){ - List list1 = actualList.stream().map(String::new).collect(Collectors.toList()); - List list2 = expectList.stream().map(String::new).collect(Collectors.toList()); + /** + * 获取需要添加的元素（在list1中存在但在list2中不存在的元素） + * @param list1 待导入的列表 + * @param list2 已存在的列表 + * @return 需要添加的元素列表 + */ + public static List subList(List list1, List list2) { + List result = new ArrayList<>(); + Set set2 = new HashSet<>(list2); // 使用HashSet提高查找效率 - if(list2.size() == 0){ - return list1; - } - if(list1.containsAll(list2) && list2.containsAll(list1)){ - return new ArrayList<>(); - } else { - List temp = list1.stream() - .filter(x->list2.contains(x)).collect(Collectors.toList()); - list1.removeAll(temp); - return list1; + for (String item : list1) { + if (!set2.contains(item)) { + result.add(item); + } } + return result; } /** - * 两个列表的交集 - * @author zhy - * @date 2023-08-18 09:59:34 - * @param list1 - * @param list2 - * @return - **/ - public static List intersectList(List list1, List list2){ - Map tempMap = list2.parallelStream().collect(Collectors.toMap(Function.identity(), Function.identity(), (oldData, newData) -> newData)); - return list1.parallelStream().filter(str->{ - return tempMap.containsKey(str); - }).collect(Collectors.toList()); + * 获取需要修改的元素（两个列表中都存在的元素） + * @param list1 待导入的列表 + * @param list2 已存在的列表 + * @return 需要修改的元素列表 + */ + public static List intersectList(List list1, List list2) { + List result = new ArrayList<>(); + Set set2 = new HashSet<>(list2); // 使用HashSet提高查找效率 + + for (String item : list1) { + if (set2.contains(item)) { + result.add(item); + } + } + return result; } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java index cfc4f51..684814a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.srs.common.annotation.Excel; import com.srs.common.core.domain.AjaxResult; import com.srs.common.core.domain.BaseEntity; @@ -38,7 +39,7 @@ import static org.apache.commons.lang3.SystemUtils.getUserName; * @date 2023-06-28 */ @Service -public class SrsSportTestServiceImpl implements ISrsSportTestService +public class SrsSportTestServiceImpl extends ServiceImpl implements ISrsSportTestService { @Autowired private SrsSportTestMapper srsSportTestMapper; @@ -274,10 +275,12 @@ public class SrsSportTestServiceImpl implements ISrsSportTestService } //修改体能测试 if (needUpdateQuery.size() != 0) { - //单条 - for (SrsSportTest srsSportTest:needUpdateQuery){ - srsSportTestMapper.updateSrsSportTest(srsSportTest); - } + this.updateBatchById(needUpdateQuery); +// //单条 +// for (SrsSportTest srsSportTest:needUpdateQuery){ +// +// srsSportTestMapper.updateSrsSportTest(srsSportTest); +// } //切片批量 // int userListSize=needUpdateQuery.size(); // int sum=userListSize/1000; From df68fc4f41cffdd8e766fdc600c2613494f5fc67 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Sun, 7 Sep 2025 18:08:18 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E9=9C=80=E6=94=B9=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E6=8A=A5=E5=88=B0=E4=B8=8D=E8=83=BD=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/srs/stureg/domain/SrsStuReg.java | 10 +++++----- .../srs/stureg/service/impl/SrsStuRegServiceImpl.java | 6 +++--- .../main/resources/mapper/stureg/SrsStuRegMapper.xml | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java b/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java index e38809c..1656665 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java +++ b/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java @@ -197,14 +197,14 @@ public class SrsStuReg extends BaseEntity @TableField("disable_descript") private String disableDescript; @Excel(name = "是否吸烟") - @TableField("isSmoke") - public String isSmoke; + @TableField("is_smoke") + private String isSmoke; @Excel(name = "是否早睡") - @TableField("isEarly") - public String isEarly; + @TableField("is_early") + private String isEarly; @Excel(name = "兴趣特长") @TableField("hobby") - public String hobby; + private String hobby; /** 注册状态 */ @Excel(name = "注册状态") @TableField("reg_status") diff --git a/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java b/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java index 4e6a089..62183cf 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java +++ b/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java @@ -963,9 +963,9 @@ public class SrsStuRegServiceImpl extends ServiceImpl + + + + From a522a20021929356690bf065161a34ffcab8e820 Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sun, 7 Sep 2025 22:07:48 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=B0=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stureg/SrsStuRegController.java | 19 +++ .../domain/GxsdxySjzx009Temp2024xsxx.java | 49 ++++++ .../java/com/srs/stureg/domain/SrsStuReg.java | 4 +- .../srs/stureg/mapper/SrsStuRegMapper.java | 6 + .../srs/stureg/service/ISrsStuRegService.java | 5 + .../service/impl/SrsStuRegServiceImpl.java | 157 +++++++++++++++++- .../mapper/stureg/SrsStuRegMapper.xml | 9 + 7 files changed, 243 insertions(+), 6 deletions(-) create mode 100644 srs-stureg/src/main/java/com/srs/stureg/domain/GxsdxySjzx009Temp2024xsxx.java diff --git a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java index b8e35b1..ea66c97 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java @@ -14,6 +14,7 @@ import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.domain.Vo.DataScreen; import com.srs.comprehensive.service.ISrsMajorsService; import com.srs.framework.web.domain.server.Sys; +import com.srs.stureg.domain.GxsdxySjzx009Temp2024xsxx; import com.srs.stureg.domain.SrsStuReg; import com.srs.stureg.domain.SrsStuRegImport; import com.srs.stureg.service.ISrsStuRegService; @@ -56,6 +57,24 @@ public class SrsStuRegController extends BaseController @Autowired ISrsMajorsService srsMajorsService; + @PreAuthorize("@ss.hasPermi('stureg:temp:index')") + @ApiOperation("同步班级代码") + @PostMapping("/syncClassCode") + public AjaxResult syncClassCode(){ + return srsStuRegService.syncClassCode(); + } + + + @PreAuthorize("@ss.hasPermi('stureg:temp:index')") + @ApiOperation("列出新生临时数据") + @GetMapping("/listXsxxTemp") + public TableDataInfo listXsxxTemp(GxsdxySjzx009Temp2024xsxx param){ + startPage(); + List res = srsStuRegService.listXsxxTemp(param); + return getDataTable(res); + } + + @ApiOperation("统计住宿") @GetMapping("/countRoomBed") public AjaxResult countRoomBed(){ diff --git a/srs-stureg/src/main/java/com/srs/stureg/domain/GxsdxySjzx009Temp2024xsxx.java b/srs-stureg/src/main/java/com/srs/stureg/domain/GxsdxySjzx009Temp2024xsxx.java new file mode 100644 index 0000000..dee52e6 --- /dev/null +++ b/srs-stureg/src/main/java/com/srs/stureg/domain/GxsdxySjzx009Temp2024xsxx.java @@ -0,0 +1,49 @@ +package com.srs.stureg.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("gxsdxy_sjzx_009_temp_2024xsxx") +public class GxsdxySjzx009Temp2024xsxx { + + @TableField("临时学号_报到后给新的") + public String 临时学号报到后给新的; // 临时学号_报到后给新的 + @TableField("姓名") + public String 姓名; // 姓名 + @TableField("性别") + public String 性别; // 性别 + @TableField("出生日期字符串") + public String 出生日期字符串; // 出生日期字符串 + @TableField("民族代码") + public String 民族代码; // 民族代码 + @TableField("民族名称") + public String 民族名称; // 民族名称 + @TableField("政治面貌代码") + public String 政治面貌代码; // 政治面貌代码 + @TableField("政治面貌名称") + public String 政治面貌名称; // 政治面貌名称 + @TableField("教务系统_所属院系") + public String 教务系统所属院系; // 教务系统_所属院系 + @TableField("教务系统_年度专业代码") + public String 教务系统年度专业代码; // 教务系统_年度专业代码\ + @TableField("教务系统_专业名称") + public String 教务系统专业名称; // 教务系统_专业名称 + @TableField("教务系统_班级编号") + public String 教务系统班级编号; // 教务系统_班级编号 + @TableField("班级名称") + public String 班级名称; // 班级名称 + @TableField("班级简称") + public String 班级简称; // 班级简称 + @TableField("是否报到核验") + public String 是否报到核验; // 是否报到核验 + @TableField("报到核验时间") + public String 报到核验时间; // 报到核验时间 + @TableField("学号") + public String 学号; // 学号 +} diff --git a/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java b/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java index e38809c..2f3c534 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java +++ b/srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java @@ -197,10 +197,10 @@ public class SrsStuReg extends BaseEntity @TableField("disable_descript") private String disableDescript; @Excel(name = "是否吸烟") - @TableField("isSmoke") + @TableField("is_smoke") public String isSmoke; @Excel(name = "是否早睡") - @TableField("isEarly") + @TableField("is_early") public String isEarly; @Excel(name = "兴趣特长") @TableField("hobby") diff --git a/srs-stureg/src/main/java/com/srs/stureg/mapper/SrsStuRegMapper.java b/srs-stureg/src/main/java/com/srs/stureg/mapper/SrsStuRegMapper.java index b6feb74..3002bc0 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/mapper/SrsStuRegMapper.java +++ b/srs-stureg/src/main/java/com/srs/stureg/mapper/SrsStuRegMapper.java @@ -1,8 +1,11 @@ package com.srs.stureg.mapper; +import com.srs.common.annotation.DataSource; +import com.srs.common.enums.DataSourceType; import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.domain.Vo.DataScreen; import com.srs.framework.mybatisplusMapper.EasyBaseMapper; +import com.srs.stureg.domain.GxsdxySjzx009Temp2024xsxx; import com.srs.stureg.domain.SrsStuReg; import com.srs.stureg.domain.VO.TeacherVo; import org.apache.ibatis.annotations.MapKey; @@ -22,6 +25,9 @@ import java.util.Map; @Mapper public interface SrsStuRegMapper extends EasyBaseMapper { + @DataSource(DataSourceType.SLAVE) + public List listXsxxTemp(GxsdxySjzx009Temp2024xsxx param); + public List> countRoomBed(); public List> countStuXb(); diff --git a/srs-stureg/src/main/java/com/srs/stureg/service/ISrsStuRegService.java b/srs-stureg/src/main/java/com/srs/stureg/service/ISrsStuRegService.java index 297a426..55b5beb 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/service/ISrsStuRegService.java +++ b/srs-stureg/src/main/java/com/srs/stureg/service/ISrsStuRegService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.srs.common.core.domain.AjaxResult; import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.domain.Vo.DataScreen; +import com.srs.stureg.domain.GxsdxySjzx009Temp2024xsxx; import com.srs.stureg.domain.SrsStuReg; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.PathVariable; @@ -24,6 +25,10 @@ import java.util.concurrent.Future; */ public interface ISrsStuRegService extends IService { + public AjaxResult syncClassCode(); + + public List listXsxxTemp(GxsdxySjzx009Temp2024xsxx param); + public List> countRoomBed(); public List> countStuXb(); diff --git a/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java b/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java index 4e6a089..cea1721 100644 --- a/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java +++ b/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java @@ -3,19 +3,20 @@ package com.srs.stureg.service.impl; import java.lang.management.LockInfo; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.srs.common.annotation.DataSource; import com.srs.common.core.domain.AjaxResult; import com.srs.common.core.domain.entity.SysDictData; import com.srs.common.core.domain.entity.SysUser; +import com.srs.common.enums.DataSourceType; import com.srs.common.exception.ServiceException; import com.srs.common.utils.DateUtils; import com.srs.common.utils.SecurityUtils; @@ -45,7 +46,11 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.web.multipart.MultipartFile; import static com.srs.common.utils.SecurityUtils.getUsername; @@ -97,6 +102,150 @@ public class SrsStuRegServiceImpl extends ServiceImpl(1000), + new ThreadFactory() { + private final AtomicInteger counter = new AtomicInteger(1); + @Override + public Thread newThread(Runnable r) { + return new Thread(r, "update-pool-1-" + counter.getAndIncrement()); + } + }, + new ThreadPoolExecutor.CallerRunsPolicy() // 任务满时让提交线程执行，避免丢失 + ); + + ThreadPoolExecutor pool2 = new ThreadPoolExecutor( + Runtime.getRuntime().availableProcessors() / 2, + Runtime.getRuntime().availableProcessors(), + 60L, TimeUnit.SECONDS, + new LinkedBlockingQueue<>(1000), + new ThreadFactory() { + private final AtomicInteger counter = new AtomicInteger(1); + @Override + public Thread newThread(Runnable r) { + return new Thread(r, "update-pool-2-" + counter.getAndIncrement()); + } + }, + new ThreadPoolExecutor.CallerRunsPolicy() + ); + + try { + List stuList = this.list(); + List tempList = srsStuRegMapper.listXsxxTemp(new GxsdxySjzx009Temp2024xsxx()); + + tempList.forEach(x -> { + x.临时学号报到后给新的 = x.临时学号报到后给新的.replace("LS", ""); + }); + + List needUpdateList = new ArrayList<>(); + for (SrsStuReg srsStuReg : stuList) { + GxsdxySjzx009Temp2024xsxx temp = tempList.stream() + .filter(x -> x.临时学号报到后给新的.equals(srsStuReg.getKSH())) + .findFirst() + .orElse(null); + if (temp != null) { + SrsStuReg stu = new SrsStuReg(); + stu.setId(srsStuReg.getId()); + stu.setBJDM(temp.教务系统班级编号); + needUpdateList.add(stu); + } + } + + if (needUpdateList.isEmpty()) { + return AjaxResult.success("没有需要更新的数据"); + } + + // 将更新列表拆分为两部分，分配给两个线程池 + int mid = needUpdateList.size() / 2; + List part1 = needUpdateList.subList(0, mid); + List part2 = needUpdateList.subList(mid, needUpdateList.size()); + + // 用于等待所有线程完成 + CountDownLatch countDownLatch = new CountDownLatch(2); + // 用于捕获线程中的异常 + AtomicReference exceptionRef = new AtomicReference<>(); + + // 提交第一个任务到线程池1 + pool1.submit(() -> { + try { + if (!part1.isEmpty()) { + boolean res = this.updateBatchById(part1); + if (!res) { + throw new Exception("线程池1批量更新失败"); + } + } + } catch (Exception e) { + exceptionRef.set(e); + } finally { + countDownLatch.countDown(); + } + }); + + // 提交第二个任务到线程池2 + pool2.submit(() -> { + try { + if (!part2.isEmpty()) { + boolean res = this.updateBatchById(part2); + if (!res) { + throw new Exception("线程池2批量更新失败"); + } + } + } catch (Exception e) { + exceptionRef.set(e); + } finally { + countDownLatch.countDown(); + } + }); + + // 等待所有任务完成（最多等待30秒） + boolean await = countDownLatch.await(30, TimeUnit.SECONDS); + if (!await) { + throw new Exception("批量更新超时"); + } + + // 检查是否有异常 + if (exceptionRef.get() != null) { + throw exceptionRef.get(); + } + + return AjaxResult.success("同步班级代码成功，共更新" + needUpdateList.size() + "条数据"); + } catch (Exception ex) { + return AjaxResult.error(ex.getMessage()); + } finally { + // 关闭线程池 + pool1.shutdown(); + pool2.shutdown(); + try { + // 等待线程池关闭（最多等5秒） + if (!pool1.awaitTermination(5, TimeUnit.SECONDS)) { + pool1.shutdownNow(); + } + if (!pool2.awaitTermination(5, TimeUnit.SECONDS)) { + pool2.shutdownNow(); + } + } catch (InterruptedException e) { + pool1.shutdownNow(); + pool2.shutdownNow(); + } + } + } + + + @Override + @DataSource(DataSourceType.SLAVE) + public List listXsxxTemp(GxsdxySjzx009Temp2024xsxx param){ + return srsStuRegMapper.listXsxxTemp(param); + } + public SrsStuRegServiceImpl(List userList) { this.userList = userList; diff --git a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml index 090bbb9..5a7552b 100644 --- a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml +++ b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml @@ -998,4 +998,13 @@ (#{item.XSXM}, #{item.KSH}, #{item.SFZH}, #{item.SJH},#{item.XB},#{item.ZZMM},#{item.MZ},#{item.XY},#{item.ZY},#{item.lastSchool},#{item.famNowAddr},#{item.sfzAddr},#{item.createTime},#{item.createBy},#{item.BJ},#{item.BJDM}) + + From 6c3046bfbd775cac0f2420e3b4f66a8a74796288 Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sun, 7 Sep 2025 22:57:35 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E5=88=86?= =?UTF-8?q?=E5=AE=BF=E8=88=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ISrsDormitoryStudentServiceImpl.java | 7 +++++++ .../main/resources/mapper/dormitory/DmsNewRegMapper.xml | 1 + .../controller/dormitory/DmsDormitoryClassController.java | 2 +- .../com/srs/stureg/service/impl/SrsStuRegServiceImpl.java | 1 + .../src/main/resources/mapper/stureg/SrsStuRegMapper.xml | 1 - 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java index 1682fdc..82ce7a0 100644 --- a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java +++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java @@ -843,6 +843,13 @@ public class ISrsDormitoryStudentServiceImpl extends ServiceImpl stuList = srsDormitoryStudentMapper.listSmokeEarly(teacherEmployeeId); + + List kshList = stuList.stream().map(SrsStuReg::getKSH).collect(Collectors.toList()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("ksh",kshList); + _newRegMapper.delete(queryWrapper); + List dormList = srsDormitoryStudentMapper.listFdyCanDorm(teacherEmployeeId); // 查询所有已分配的ksh，避免重复插入 diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml index ff266d7..0601499 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml @@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.dormitory_id = #{dormitoryId} and b.BJDM = #{classCode} + order by a.ksh asc - - and stu_id = #{stuId} - and stu_year_id = #{stuYearId} - and ce_score = #{ceScore} - and stu.class_id = #{student.classId} - and stu.stu_no = #{student.stuNo} - and stu.name like #{student.name} + + and stu_id = #{stuId} + and stu_year_id = #{stuYearId} + and ce_score = #{ceScore} + and stu.class_id = #{student.classId} + and stu.stu_no = #{student.stuNo} + and stu.name like #{student.name} - select id, stu_id, stu_year_id, ce_score, del_flag, create_by, create_time, update_by, update_time + select id, + stu_id, + stu_year_id, + ce_score, + del_flag, + create_by, + create_time, + update_by, + update_time from srs_ce_score - + - + insert into srs_ce_score @@ -95,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, stu_no - + #{stuId}, #{stuYearId}, @@ -106,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{stuNo} - + @@ -124,12 +139,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + - delete from srs_ce_score where id = #{id} + delete + from srs_ce_score + where id = #{id} - delete from srs_ce_score where id in + delete from srs_ce_score where id in #{id} @@ -137,16 +157,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml index b877003..60aaa7f 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml @@ -1,38 +1,39 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46,106 +47,152 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - select s.stu_id,s.stu_no, s.name, s.gender, s.birthday, AES_DECRYPT(UNHEX(s.id_card),'zhxg') as id_card , s.dept_id, major_id, class_id, s.phone, s.address, - s.status, s.create_by, s.create_time, s.update_by, s.update_time, s.del_flag,s.xhk,s.bank_addr + select s.stu_id, + s.stu_no, + s.name, + s.gender, + s.birthday, + AES_DECRYPT(UNHEX(s.id_card), 'zhxg') as id_card, + s.dept_id, + major_id, + class_id, + s.phone, + s.address, + s.status, + s.create_by, + s.create_time, + s.update_by, + s.update_time, + s.del_flag, + s.xhk, + s.bank_addr from srs_student s - select s.stu_id,s.stu_no, s.name, s.gender, s.birthday,AES_DECRYPT(UNHEX(s.id_card),'zhxg') as id_card , d.dept_id, m.major_id, c.class_id, s.phone, s.address, - s.status, s.status as status2,s.create_by, s.create_time, s.update_by, s.update_time, s.del_flag,s.xhk,s.bank_addr,e.name as cphName,f.grade_name, - d.*,m.*,c.*,g.* + select s.stu_id, + s.stu_no, + s.name, + s.gender, + s.birthday, + AES_DECRYPT(UNHEX(s.id_card), 'zhxg') as id_card, + d.dept_id, + m.major_id, + c.class_id, + s.phone, + s.address, + s.status, + s.status as status2, + s.create_by, + s.create_time, + s.update_by, + s.update_time, + s.del_flag, + s.xhk, + s.bank_addr, + e.name as cphName, + f.grade_name, + d.*, + m.*, + c.*, + g.* from srs_student s left JOIN srs_class c ON s.class_id = c.class_id left JOIN srs_majors m ON c.major_id = m.major_id left JOIN sys_dept d ON m.college_id = d.dept_id left join cph_teacher as e on c.teacher_id = e.teacher_id - left join srs_grade as f on f.grade_id=c.grade_id - left join cph_stu_extra_info g on g.stu_no=s.stu_no + left join srs_grade as f on f.grade_id = c.grade_id + left join cph_stu_extra_info g on g.stu_no = s.stu_no - + select a.stu_no, a.`name` as stu_name, b.class_name + from srs_student as a + left join srs_class as b on a.class_id = b.class_id where a.stu_no = #{stuNo} @@ -158,7 +205,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where stu_no = #{stuNo} insert into srs_student @@ -181,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag, room_id, - + #{name}, #{stuNo}, @@ -200,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{delFlag}, #{roomId}, - + @@ -228,7 +277,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from srs_student where stu_id = #{stuId} + delete + from srs_student + where stu_id = #{stuId} @@ -249,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE stu_no = #{student.stuNo} - + update srs_student @@ -333,42 +384,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select count(a.stu_no) as stu_count, b.grade_name from cph_biye_apply as a left join view_stu_info as b on a.stu_no = b.stu_no where a.apply_status = 6 GROUP BY b.grade_id - + select count(a.stu_no) as stu_count, case b.grade_name is null when true then "无年级" else b.grade_name end as grade_name, @@ -380,8 +433,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by b.grade_id - + SELECT * FROM srs_student + WHERE class_id IN + + #{classId} + + AND del_flag = '0' + + + - + select sum(b.occupancy) as all_in, + a.park_name, + a.campus_name, + sum(a.bed_num) as `all`, + (select count(t1.stu_no) from view_stu_info as t1 where t1.`status` = '01') as stu_count from view_dorm_info as a left join view_dorm_stu_count as b on a.id = b.dormitory_id GROUP BY a.park_id @@ -516,185 +588,237 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.grade_id = #{gradeId} - + select + quit_school_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,quit_type,quit_category,quit_year,process_instance_id,deploy_id + from rt_stu_quit_school apply_status = 1 - and department_name=#{departmentName} - and stu_no=#{stuNo} - and stu_name=#{stuName} + and department_name=#{departmentName} + and stu_no=#{stuNo} + and stu_name=#{stuName} order by grade_name,class_name - + select + application_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,penalty_type,process_instance_id,deploy_id + from rt_stu_disciplinary_application penalty_status = 0 - and department_name=#{departmentName} - and stu_no=#{stuNo} - and stu_name=#{stuName} + and department_name=#{departmentName} + and stu_no=#{stuNo} + and stu_name=#{stuName} order by grade_name,class_name - + select + drop_out_school_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,quit_year,drop_out_type,drop_out_category,process_instance_id,deploy_id + from rt_stu_drop_out_school apply_status = 1 - and department_name=#{departmentName} - and stu_no=#{stuNo} - and stu_name=#{stuName} + and department_name=#{departmentName} + and stu_no=#{stuNo} + and stu_name=#{stuName} order by grade_name,class_name - select id,xh,xm,xb,mz,hjszd,bj,xy,nj,xsqmyj,apply_year from srs_knrd_apply a - where stu_year_id = (select id from srs_stu_year where status=1) and step >= 5 and xsqmyj !=4 - and xy=#{departmentName} - and xh=#{stuNo} - and xm=#{stuName} + where stu_year_id = (select id from srs_stu_year where status=1) and step >= 5 and xsqmyj !=4 + and xy=#{departmentName} + and xh=#{stuNo} + and xm=#{stuName} order by NJ desc,bj desc - + select id,xh,xm,xb,mz,dz,bj,xy,nj, kndj,apply_year from srs_zxj_apply + where stu_year_id = (select id FROM srs_stu_year where status=1) and step =4 + and xy=#{departmentName} + and xh=#{stuNo} + and xm=#{stuName} + order by NJ desc,bj desc - + select f.grade_code as gradeCode, count(1) as number + from srs_student s + left join srs_class c on s.class_id = c.class_id + left join srs_majors m on c.major_id = m.major_id + left join sys_dept d on m.college_id = d.dept_id + left join cph_teacher as e on c.teacher_id = e.teacher_id + left join srs_grade as f on f.grade_id = c.grade_id + where f.grade_code >= year (date_sub(curdate(), interval 5 year)) + group by f.grade_code + order by f.grade_code diff --git a/srs-staff/src/main/java/com/srs/staff/service/impl/SrsStaffOneStopRegistrationRecordServiceImpl.java b/srs-staff/src/main/java/com/srs/staff/service/impl/SrsStaffOneStopRegistrationRecordServiceImpl.java index 6fe3041..651f038 100644 --- a/srs-staff/src/main/java/com/srs/staff/service/impl/SrsStaffOneStopRegistrationRecordServiceImpl.java +++ b/srs-staff/src/main/java/com/srs/staff/service/impl/SrsStaffOneStopRegistrationRecordServiceImpl.java @@ -102,7 +102,7 @@ public class SrsStaffOneStopRegistrationRecordServiceImpl extends ServiceImpl Date: Mon, 8 Sep 2025 20:50:46 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E7=BB=BC=E5=90=88=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E9=93=BA=E5=AF=BC=E5=91=98=E5=AF=BC=E5=85=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SrsSportTestServiceImpl.java | 4 ++-- .../mapper/comprehensive/CphTeacherMapper.xml | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java index 684814a..1a5bf9e 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java @@ -81,7 +81,7 @@ public class SrsSportTestServiceImpl extends ServiceImpl + select b.dept_id + from sys_dept_map as a + left join sys_dept as b on a.old_dept_id = b.dept_id + where b.dept_name = #{deptName} + From 853bc0b92b1d848edfbfc2b7b4c9a4e2e61a05eb Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Wed, 10 Sep 2025 21:51:18 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E4=B8=93=E4=B8=9A=20=E5=AD=A6=E9=99=A2?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../srs/comprehensive/service/impl/SrsMajorsServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java index 119bdc1..012ed5f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java @@ -247,9 +247,9 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService // srsMajors1.setCollegeId(0L);//学院id/科室号 // } // } - if (map.get("yxdm")!=null) { + if (map.get("yxmc")!=null) { //使用代码查询学院id - Long yxdm = srsMajorsMapper.selectXYID(map.get("yxdm").toString()); + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); if (yxdm!=null) { srsMajors1.setCollegeId(yxdm);//学院id }else { From 643f2f79793556315a0e0741b1d28c10ef102261 Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Thu, 11 Sep 2025 11:36:34 +0800 Subject: [PATCH 20/29] =?UTF-8?q?=E4=B8=93=E4=B8=9A=20=E5=AD=A6=E9=99=A2?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SrsMajorsServiceImpl.java | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java index 012ed5f..f5bb357 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java @@ -156,7 +156,7 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService //同步专业 @Override public void sqlserverSynchronousMYSQL(List list) { - List srsMajors = srsMajorsMapper.selectSrsmajorsList();//专业列表 + List srsMajors = srsMajorsMapper.selectSrsmajorsList();//数据库存在的专业列表 //查找重复值 List updateMap = list.stream() .filter(obj1 -> srsMajors @@ -195,19 +195,6 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService } srsMajors1.setStatus("0"); -// Object zydmobj2=map.get("zydm"); -// if (zydmobj2!=null) { -// //科室号查询学院id -// String ksh = selectClassSpecialty(zydmobj2.toString());; -// if (ksh!=null){ -// Long deptId = cphTeacherMapper.selectDeptCode(ksh); -// if (deptId!=null){ -// srsMajors1.setCollegeId(deptId); -// } -// }else { -// srsMajors1.setCollegeId(0L);//学院id/科室号 -// } -// } if (map.get("yxmc")!=null) { //使用代码查询学院id Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); @@ -234,19 +221,7 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService if (zymcobj!=null) { srsMajors1.setMajorName(zymcobj.toString()); } -// Object zydmobj2=map.get("zydm"); -// if (zydmobj2!=null) { -// //科室号查询学院id -// String ksh = selectClassSpecialty(zydmobj2.toString());; -// if (ksh!=null){ -// Long deptId = cphTeacherMapper.selectDeptCode(ksh); -// if (deptId!=null){ -// srsMajors1.setCollegeId(deptId); -// } -// }else { -// srsMajors1.setCollegeId(0L);//学院id/科室号 -// } -// } + if (map.get("yxmc")!=null) { //使用代码查询学院id Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); @@ -267,7 +242,7 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService List> lists = ListSliceUtil.updateSlice(updateSrsStudent); if (lists != null) { for (List studentList:lists){ - // srsMajorsMapper.updateSrsStudentList(studentList); // 20240822 专业同步只新增不修改 + srsMajorsMapper.updateSrsStudentList(studentList); } } } 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 21/29] =?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 22/29] =?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 23/29] =?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 24/29] =?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 25/29] =?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); } } From 73707d176d2904f505f41f4925ed6fc207df2fad Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Fri, 12 Sep 2025 21:23:32 +0800 Subject: [PATCH 26/29] =?UTF-8?q?=E7=A7=91=E5=AD=A6=E6=96=87=E5=8C=96?= =?UTF-8?q?=E7=B4=A0=E8=B4=A8=20=E7=8F=AD=E7=BA=A7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/comprehensive/CphProRankingMapper.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml index dd83be7..844153c 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml @@ -55,17 +55,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + select a.* + from srs_add_record as a + left join cph_iam as b on a.iam_id = b.id + where b.audit_status not in (6,12) + From a0c41f55201df34081743b02a105e806daae136a Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sat, 13 Sep 2025 22:38:42 +0800 Subject: [PATCH 28/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=9D=E6=83=B3?= =?UTF-8?q?=E5=93=81=E5=BE=B7=E5=8A=A0=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphAuditDetailsController.java | 27 ++++++ .../comprehensive/domain/CphAuditDetails.java | 3 + .../comprehensive/domain/SrsAddRecord.java | 4 + .../srs/comprehensive/domain/Vo/CheckIam.java | 21 +++++ .../mapper/CphAuditDetailsMapper.java | 8 ++ .../service/ICphAuditDetailsService.java | 11 +++ .../impl/CphAuditDetailsServiceImpl.java | 87 ++++++++++++++++++- .../comprehensive/CphAuditDetailsMapper.xml | 68 +++++++++++++++ 8 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java index 8ff8314..dbdeda0 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java @@ -1,14 +1,18 @@ package com.srs.web.controller.comprehensive; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.srs.common.annotation.RepeatSubmit; import com.srs.comprehensive.domain.CphMsg; import com.srs.comprehensive.domain.Dto.CphCancel; import com.srs.comprehensive.domain.Dto.CphResub; +import com.srs.comprehensive.domain.SrsAddRecord; import com.srs.comprehensive.domain.SrsStudent; +import com.srs.comprehensive.domain.Vo.CheckIam; import com.srs.comprehensive.domain.Vo.CphApply; import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.service.ICphMsgService; @@ -52,6 +56,29 @@ public class CphAuditDetailsController extends BaseController { @Autowired private ISrsStudentService _student; + @PostMapping("/plusCheckRecord") + public AjaxResult plusCheckRecord(@RequestBody CphAuditDetails param){ + return cphAuditDetailsService.plusCheckRecord(param); + } + + + @GetMapping("/listCheckAuditAndRecord") + public AjaxResult listCheckAuditAndRecord(CheckIam param) { + Map map = new HashMap<>(); + List list = cphAuditDetailsService.listCheckAudit(param); + List srsAddRecordList = cphAuditDetailsService.ListCheckRecord(param); + map.put("auditList", list); + map.put("recordList", srsAddRecordList); + return AjaxResult.success(map); + } + + @GetMapping("/checkIamList") + public AjaxResult checkIamList(){ + List res = cphAuditDetailsService.checkIamList(); + return AjaxResult.success(res); + } + + //清除审核状态不正确的加分记录 @PostMapping("/cleanCancelRecord") public AjaxResult cleanCancelRecord(){ diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java index 75b909d..5ebb94d 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java @@ -64,6 +64,9 @@ public class CphAuditDetails extends BaseEntity private String className; private String stuNo; private Long gradeId; + public BigDecimal iamScore; + public String auditStatus; + public Long stuYearId; public String getDeptName() { diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java index 00f07cb..79f01e6 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java @@ -1,6 +1,7 @@ package com.srs.comprehensive.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -86,6 +87,9 @@ public class SrsAddRecord extends BaseEntity { */ private String delFlag; + @TableField(exist = false) + public String ruleName; + // public void setAddPointsPerson(Long addPointsPerson) { // this.addPointsPerson = addPointsPerson; // } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java new file mode 100644 index 0000000..51fc598 --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java @@ -0,0 +1,21 @@ +package com.srs.comprehensive.domain.Vo; + +import lombok.Data; + +import java.math.BigDecimal; + +//思想品德检查 +@Data +public class CheckIam { + + public Long stuYearId; + + public String stuNo; + + public BigDecimal q2Score; + + public BigDecimal q1Score; + + public String diffType; + +} diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java index 16b5f0c..a9c5d44 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java @@ -3,6 +3,7 @@ package com.srs.comprehensive.mapper; import java.util.List; import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.SrsAddRecord; +import com.srs.comprehensive.domain.Vo.CheckIam; import org.apache.ibatis.annotations.Mapper; /** @@ -85,4 +86,11 @@ public interface CphAuditDetailsMapper //查询审核状态不对的加分记录 public List listCancelRecord(); + + public List checkIamList(); + + public List listCheckAudit(CheckIam param); + + public List ListCheckRecord(CheckIam param); + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java index cc03ac7..fe45d0a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java @@ -6,8 +6,11 @@ import com.srs.common.core.domain.AjaxResult; import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.Dto.CphCancel; import com.srs.comprehensive.domain.Dto.CphResub; +import com.srs.comprehensive.domain.SrsAddRecord; +import com.srs.comprehensive.domain.Vo.CheckIam; import com.srs.comprehensive.domain.Vo.CphApply; import com.srs.comprehensive.domain.Vo.CphSearch; +import org.springframework.web.bind.annotation.RequestBody; /** * 审核明细Service接口 @@ -18,6 +21,14 @@ import com.srs.comprehensive.domain.Vo.CphSearch; public interface ICphAuditDetailsService { + public AjaxResult plusCheckRecord( CphAuditDetails param); + + public List listCheckAudit(CheckIam param); + + public List ListCheckRecord(CheckIam param); + + public List checkIamList(); + public AjaxResult cleanCancelRecord(); public int reSub(CphResub param); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java index e5cbe57..c4ea80f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java @@ -14,10 +14,12 @@ import com.srs.common.utils.PageUtils; import com.srs.comprehensive.domain.*; import com.srs.comprehensive.domain.Dto.CphCancel; import com.srs.comprehensive.domain.Dto.CphResub; +import com.srs.comprehensive.domain.Vo.CheckIam; import com.srs.comprehensive.domain.Vo.CphApply; import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.mapper.CphIamMapper; import com.srs.comprehensive.mapper.SrsAddRecordMapper; +import com.srs.comprehensive.mapper.ViewStuInfoMapper; import com.srs.comprehensive.service.*; import com.srs.system.domain.SysPost; import com.srs.system.service.ISysPostService; @@ -437,8 +439,8 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { temp.setId(cphAuditDetails.getProjectId()); temp.setAuditStatus(cphAuditDetails.getStatusCode().toString()); cphIamService.updateCphIam(temp); - Long statusCode=cphAuditDetailsMapper.selectCphAuditDetailsById(cphAuditDetails.getId()).getStatusCode(); - if (statusCode == 6L)//判断审核状态是否完成 +// Long statusCode=cphAuditDetailsMapper.selectCphAuditDetailsById(cphAuditDetails.getId()).getStatusCode(); + if (cphAuditDetails.getStatusCode() == 6L)//判断审核状态是否完成 { SrsStudent stu = _stuService.selectSrsStudentByStuId(cphAuditDetails.getSubmitterId()); SrsAddRecord srsAddRecord = new SrsAddRecord();//加分记录表 @@ -575,6 +577,85 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { cphAuditDetailsS.setStatusCode(cphAuditDetails.getStatusCode()); int i = cphAuditDetailsMapper.updateCphAuditDetails(cphAuditDetailsS); return -1; - } + + @Override + public List checkIamList(){ + return cphAuditDetailsMapper.checkIamList(); + } + + @Override + public List listCheckAudit(CheckIam param){ + return cphAuditDetailsMapper.listCheckAudit(param); + } + + + @Override + public List ListCheckRecord(CheckIam param){ + return cphAuditDetailsMapper.ListCheckRecord(param); + } + + @Autowired + private ViewStuInfoMapper viewStuInfoMapper; + + @Override + public AjaxResult plusCheckRecord(CphAuditDetails param){ + try{ + Long auditId = param.getId(); + CphAuditDetails cphAuditDetails = selectCphAuditDetailsById(auditId); + if(cphAuditDetails == null){ + throw new Exception("审核记录不存在"); + } + + Long iamId = cphAuditDetails.getProjectId(); + CphIam cphIam = cphIamService.selectCphIamById(iamId); + if(cphIam == null){ + throw new Exception("思想品德记录不存在"); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stu_id", cphIam.getToAdd()); + ViewStuInfo viewStuInfo = viewStuInfoMapper.selectOne(queryWrapper); + if(viewStuInfo == null) { + throw new Exception("学生信息不存在"); + } + + SrsAddRecord query = new SrsAddRecord(); + query.setIamId(iamId); + query.setStatusCode("6"); + query.setStuYearId(Math.toIntExact(cphIam.getStuYearId())); + List srsAddRecordList = srsAddRecordService.selectSrsAddRecordList(query); + if(!srsAddRecordList.isEmpty()){ + throw new Exception("该记录已存在"); + } + + SrsAddRecord srsAddRecord = new SrsAddRecord(); + srsAddRecord.setStuNo(viewStuInfo.getStuNo()); + srsAddRecord.setApplicant(getUserId()); + srsAddRecord.setRuleId(cphIam.getRuleId()); + srsAddRecord.setDescription(cphIam.getDescription()); + srsAddRecord.setMaterial(cphIam.getMaterial()); + srsAddRecord.setRecordScore(cphIam.getIamScore()); + srsAddRecord.setStuYearId(Math.toIntExact(cphIam.getStuYearId())); + srsAddRecord.setIamId(cphIam.getId()); + + srsAddRecord.setStatusCode("6"); + srsAddRecord.setStatus("0"); + srsAddRecord.setDelFlag("0"); + + srsAddRecord.setCreateBy(getUsername()); + srsAddRecord.setUpdateBy(getUsername()); + srsAddRecord.setCreateTime(getNowDate()); + srsAddRecord.setUpdateTime(getNowDate()); + + int i = srsAddRecordService.insertSrsAddRecord(srsAddRecord); + if(i == 0){ + throw new Exception("添加加分记录失败"); + } + + return AjaxResult.success(); + }catch(Exception ex){ + return AjaxResult.error(ex.getMessage()); + } + } + } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml index 1a1d597..1aeef9b 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml @@ -177,4 +177,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join cph_iam as b on a.iam_id = b.id where b.audit_status not in (6,12) + + + + + + From 25fa96087bef82b1e53030f410ceefdc321549e1 Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sun, 14 Sep 2025 01:48:16 +0800 Subject: [PATCH 29/29] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=80=9D?= =?UTF-8?q?=E6=83=B3=E5=93=81=E5=BE=B7=E6=94=BE=E5=88=86=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphIdeologyScoreController.java | 9 +++ .../service/ICphIdeologyScoreService.java | 5 ++ .../impl/CphIdeologyScoreServiceImpl.java | 80 +++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java index 3c3412f..be7c9e8 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java @@ -34,6 +34,15 @@ public class CphIdeologyScoreController extends BaseController { @Autowired private ICphIdeologyScoreService cphIdeologyScoreService; + @PreAuthorize("@ss.hasPermi('comprehensive:ideologyscore:list')") + @PostMapping("/doInit") + @ApiOperation("初始化当前学年分数") + public AjaxResult doInit(){ + return cphIdeologyScoreService.doInit(); + } + + + /** * 查询思想品德初始分数列表 */ diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphIdeologyScoreService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphIdeologyScoreService.java index c3ca53b..6507043 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphIdeologyScoreService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphIdeologyScoreService.java @@ -3,6 +3,7 @@ package com.srs.comprehensive.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; +import com.srs.common.core.domain.AjaxResult; import com.srs.comprehensive.domain.CphIdeologyScore; /** @@ -12,6 +13,10 @@ import com.srs.comprehensive.domain.CphIdeologyScore; * @date 2024-07-01 */ public interface ICphIdeologyScoreService extends IService { + + + public AjaxResult doInit(); + /** * 查询思想品德初始分数 * diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphIdeologyScoreServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphIdeologyScoreServiceImpl.java index e511a81..43c231d 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphIdeologyScoreServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphIdeologyScoreServiceImpl.java @@ -1,8 +1,19 @@ package com.srs.comprehensive.service.impl; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.srs.common.core.domain.AjaxResult; import com.srs.common.utils.DateUtils; +import com.srs.comprehensive.domain.SrsStuYear; +import com.srs.comprehensive.domain.ViewStuInfo; +import com.srs.comprehensive.mapper.SrsStuYearMapper; +import com.srs.comprehensive.mapper.ViewStuInfoMapper; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -10,6 +21,8 @@ import com.srs.comprehensive.mapper.CphIdeologyScoreMapper; import com.srs.comprehensive.domain.CphIdeologyScore; import com.srs.comprehensive.service.ICphIdeologyScoreService; +import static com.srs.common.utils.SecurityUtils.getUsername; + /** * 思想品德初始分数Service业务层处理 * @@ -21,6 +34,73 @@ public class CphIdeologyScoreServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("status","1"); + queryWrapper.last("limit 1"); + SrsStuYear srsStuYear = srsStuYearMapper.selectOne(queryWrapper); + if(srsStuYear == null){ + throw new Exception("未找到有效学年信息"); + } + + + QueryWrapper viewStuInfoQueryWrapper = new QueryWrapper<>(); + viewStuInfoQueryWrapper.notIn("status","02","03"); + List viewStuInfoList = viewStuInfoMapper.selectList(viewStuInfoQueryWrapper); + + Set stuNoSet = viewStuInfoList.stream().map(ViewStuInfo::getStuNo).collect(Collectors.toSet()); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("stu_year_id",srsStuYear.getId()); + queryWrapper1.in("stu_no",stuNoSet); + List cphIdeologyScoreList = cphIdeologyScoreMapper.selectList(queryWrapper1); + if(!cphIdeologyScoreList.isEmpty()){ + // 提取已评分的学生学号 + Set scoredStuNoSet = cphIdeologyScoreList.stream() + .map(CphIdeologyScore::getStuNo) + .collect(Collectors.toSet()); + + // 移除已评分的学生学号 + stuNoSet.removeAll(scoredStuNoSet); + } + + List needInsertList = new ArrayList<>(); + for(String stuNo : stuNoSet){ + CphIdeologyScore cphIdeologyScore = new CphIdeologyScore(); + cphIdeologyScore.setStuNo(stuNo); + cphIdeologyScore.setStuYearId(srsStuYear.getId()); + cphIdeologyScore.setScore(new BigDecimal(80)); + cphIdeologyScore.setDescription("初始分数"); + cphIdeologyScore.setStatus("1"); + cphIdeologyScore.setDelFlag("0"); + cphIdeologyScore.setCreateTime(DateUtils.getNowDate()); + cphIdeologyScore.setUpdateTime(DateUtils.getNowDate()); + cphIdeologyScore.setCreateBy(getUsername()); + cphIdeologyScore.setUpdateBy(getUsername()); + needInsertList.add(cphIdeologyScore); + } + + if(!needInsertList.isEmpty()){ + boolean res = this.saveBatch(needInsertList); + if(!res){ + throw new Exception("初始化分数失败"); + } + } + + return AjaxResult.success(); + }catch(Exception ex){ + return AjaxResult.error(ex.getMessage()); + } + } + /** * 查询思想品德初始分数 *