提交代码

backend/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,48 @@
+server:
+  port: 9090
+spring:
+  application:
+    name: ruoyi-monitor-admin
+  profiles:
+    active: @profiles.active@
+
+logging:
+  config: classpath:logback-plus.xml
+
+--- # 监控中心服务端配置
+spring:
+  security:
+    user:
+      name: @monitor.username@
+      password: @monitor.password@
+  boot:
+    admin:
+      ui:
+        title: RuoYi-Vue-Plus服务监控中心
+      context-path: /admin
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: ALWAYS
+    logfile:
+      external-file: ./logs/ruoyi-monitor-admin.log
+
+--- # 监控配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: true
+  # 设置 Spring Boot Admin Server 地址
+  url: http://172.16.0.67:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@

backend/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
   # 设置 Spring Boot Admin Server 地址
-  url: http://172.16.0.67:9090/admin
+  url: http://127.0.0.1:9090/admin
   instance:
     service-host-type: IP
     metadata:

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java

@@ -0,0 +1,123 @@
+package org.dromara.xg.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.xg.domain.vo.XgCollegeLeaderVo;
+import org.dromara.xg.domain.bo.XgCollegeLeaderBo;
+import org.dromara.xg.service.IXgCollegeLeaderService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+/**
+ * 二级学院分管领导配置
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+@Tag(name = "二级学院分管领导配置")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xg/ejxyfgld")
+public class XgCollegeLeaderController extends BaseController {
+
+    private final IXgCollegeLeaderService xgCollegeLeaderService;
+
+    /**
+     * 查询二级学院分管领导配置列表
+     */
+    @Operation(summary = "查询二级学院分管领导配置列表")
+    @SaCheckPermission("xg:ejxyfgld:list")
+    @GetMapping("/list")
+    public TableDataInfo<XgCollegeLeaderVo> list(XgCollegeLeaderBo bo, PageQuery pageQuery) {
+        return xgCollegeLeaderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 根据学院ID查询分管领导列表
+     */
+    @Operation(summary = "根据学院ID查询分管领导列表")
+    @SaCheckPermission("xg:ejxyfgld:list")
+    @GetMapping("/listByCollege/{collegeId}")
+    public R<List<XgCollegeLeaderVo>> listByCollege(@PathVariable Long collegeId) {
+        List<XgCollegeLeaderVo> list = xgCollegeLeaderService.queryByCollegeId(collegeId);
+        return R.ok(list);
+    }
+
+    /**
+     * 导出二级学院分管领导配置列表
+     */
+    @Operation(summary = "导出二级学院分管领导配置列表")
+    @SaCheckPermission("xg:ejxyfgld:export")
+    @Log(title = "二级学院分管领导配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XgCollegeLeaderBo bo, HttpServletResponse response) {
+        List<XgCollegeLeaderVo> list = xgCollegeLeaderService.queryList(bo);
+        ExcelUtil.exportExcel(list, "二级学院分管领导配置", XgCollegeLeaderVo.class, response);
+    }
+
+    /**
+     * 获取二级学院分管领导配置详细信息
+     *
+     * @param id 主键
+     */
+    @Operation(summary = "获取二级学院分管领导配置详细信息")
+    @SaCheckPermission("xg:ejxyfgld:query")
+    @GetMapping("/{id}")
+    public R<XgCollegeLeaderVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(xgCollegeLeaderService.queryById(id));
+    }
+
+    /**
+     * 新增二级学院分管领导配置
+     */
+    @Operation(summary = "新增二级学院分管领导配置")
+    @SaCheckPermission("xg:ejxyfgld:add")
+    @Log(title = "二级学院分管领导配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XgCollegeLeaderBo bo) {
+        return toAjax(xgCollegeLeaderService.insertByBo(bo));
+    }
+
+    /**
+     * 修改二级学院分管领导配置
+     */
+    @Operation(summary = "修改二级学院分管领导配置")
+    @SaCheckPermission("xg:ejxyfgld:edit")
+    @Log(title = "二级学院分管领导配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XgCollegeLeaderBo bo) {
+        return toAjax(xgCollegeLeaderService.updateByBo(bo));
+    }
+
+    /**
+     * 删除二级学院分管领导配置
+     *
+     * @param ids 主键串
+     */
+    @Operation(summary = "删除二级学院分管领导配置")
+    @SaCheckPermission("xg:ejxyfgld:remove")
+    @Log(title = "二级学院分管领导配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(xgCollegeLeaderService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java

@@ -823,6 +823,23 @@ public class XgStudentMsgController extends BaseController {
         return R.ok(approverUserIds);
     }
 
+    /**
+     * 根据学生ID获取二级学院分管领导ID列表
+     *
+     * @param studentId 学生ID
+     * @return 分管领导ID列表
+     */
+    @SaCheckPermission("studentMsg:studentMsg:query")
+    @GetMapping("/getCollegeLeaders/{studentId}")
+    public R<List<Long>> getCollegeLeaders(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
+        log.info("根据学生ID获取二级学院分管领导ID列表 - 学生ID: {}", studentId);
+        List<Long> leaderIds = xgStudentMsgService.getCollegeLeadersByStudentId(studentId);
+        if (leaderIds.isEmpty()) {
+            return R.fail("未找到该学生所在学院的分管领导");
+        }
+        return R.ok(leaderIds);
+    }
+
     /**
      * 导入数据
      *

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysUserController.java

@@ -28,7 +28,7 @@ public class XgSysUserController extends BaseController {
     private final IXgSysUserService xgSysUserService;
 
     /**
-     * 查询有效用户列表
+     * 查询有效用户列表（教职工account_type=1）
      */
     @SaCheckPermission("xg:sysUser:list")
     @GetMapping("/activeList")

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/XgCollegeLeader.java

@@ -0,0 +1,61 @@
+package org.dromara.xg.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 二级学院分管领导配置对象 xg_college_leader
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xg_college_leader")
+public class XgCollegeLeader extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID（雪花ID）
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic(value = "0", delval = "1")
+    private Long deleted;
+
+    /**
+     * 二级学院ID，关联sys_dept.dept_id
+     */
+    private Long collegeId;
+
+    /**
+     * 二级学院名称
+     */
+    private String collegeName;
+
+    /**
+     * 分管领导ID，关联sys_user.user_id
+     */
+    private Long leaderId;
+
+    /**
+     * 分管领导姓名
+     */
+    private String leaderName;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/XgSysUser.java

@@ -27,6 +27,11 @@ public class XgSysUser extends TenantEntity {
     @TableId(value = "user_id")
     private Long userId;
 
+    /**
+     * 用户账号
+     */
+    private String userName;
+
     /**
      * 用户昵称
      */

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/bo/XgCollegeLeaderBo.java

@@ -0,0 +1,61 @@
+package org.dromara.xg.domain.bo;
+
+import org.dromara.xg.domain.XgCollegeLeader;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 二级学院分管领导配置业务对象 xg_college_leader
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XgCollegeLeader.class, reverseConvertGenerate = false)
+public class XgCollegeLeaderBo extends BaseEntity {
+
+    /**
+     * 主键ID（雪花ID）
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    private Long deleted;
+
+    /**
+     * 二级学院ID，关联sys_dept.dept_id
+     */
+    @NotNull(message = "二级学院不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long collegeId;
+
+    /**
+     * 二级学院名称
+     */
+    private String collegeName;
+
+    /**
+     * 分管领导ID，关联sys_user.user_id
+     */
+    @NotNull(message = "分管领导不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long leaderId;
+
+    /**
+     * 分管领导姓名
+     */
+    private String leaderName;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgCollegeLeaderVo.java

@@ -0,0 +1,88 @@
+package org.dromara.xg.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.xg.domain.XgCollegeLeader;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 二级学院分管领导配置视图对象 xg_college_leader
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XgCollegeLeader.class)
+public class XgCollegeLeaderVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID（雪花ID）
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 二级学院ID，关联sys_dept.dept_id
+     */
+    @ExcelProperty(value = "二级学院ID")
+    private Long collegeId;
+
+    /**
+     * 二级学院名称
+     */
+    @ExcelProperty(value = "二级学院名称")
+    private String collegeName;
+
+    /**
+     * 分管领导ID，关联sys_user.user_id
+     */
+    @ExcelProperty(value = "分管领导ID")
+    private Long leaderId;
+
+    /**
+     * 分管领导姓名
+     */
+    @ExcelProperty(value = "分管领导姓名")
+    private String leaderName;
+
+    /**
+     * 备注信息
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgCollegeLeaderMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.xg.mapper;
+
+import org.dromara.xg.domain.XgCollegeLeader;
+import org.dromara.xg.domain.vo.XgCollegeLeaderVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 二级学院分管领导配置Mapper接口
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+public interface XgCollegeLeaderMapper extends BaseMapperPlus<XgCollegeLeader, XgCollegeLeaderVo> {
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgStudentMsgMapper.java

@@ -19,87 +19,95 @@ import java.util.Map;
  */
 public interface XgStudentMsgMapper extends BaseMapperPlus<XgStudentMsg, XgStudentMsgVo> {
 
-    /**
-     * 根据组织ID列表分页查询学生信息 用于导出
-     *
-     * @param page         分页参数
-     * @param queryWrapper 查询条件
-     * @param deptIds      组织ID列表
-     * @return 学生信息分页结果
-     */
-    List<XgStudentMsgExportVo> queryPageListExportByDeptId(
-            @Param("ew") LambdaQueryWrapper<XgStudentMsg> queryWrapper,
-            @Param("deptIds") List<Long> deptIds);
+        /**
+         * 根据组织ID列表分页查询学生信息 用于导出
+         *
+         * @param page         分页参数
+         * @param queryWrapper 查询条件
+         * @param deptIds      组织ID列表
+         * @return 学生信息分页结果
+         */
+        List<XgStudentMsgExportVo> queryPageListExportByDeptId(
+                        @Param("ew") LambdaQueryWrapper<XgStudentMsg> queryWrapper,
+                        @Param("deptIds") List<Long> deptIds);
 
-    /**
-     * 根据组织ID列表分页查询学生信息
-     *
-     * @param page         分页参数
-     * @param queryWrapper 查询条件
-     * @param deptIds      组织ID列表
-     * @return 学生信息分页结果
-     */
-    Page<XgStudentMsgVo> selectPageByDeptIds(@Param("page") Page<XgStudentMsgVo> page,
-            @Param("ew") LambdaQueryWrapper<XgStudentMsg> queryWrapper,
-            @Param("deptIds") List<Long> deptIds);
+        /**
+         * 根据组织ID列表分页查询学生信息
+         *
+         * @param page         分页参数
+         * @param queryWrapper 查询条件
+         * @param deptIds      组织ID列表
+         * @return 学生信息分页结果
+         */
+        Page<XgStudentMsgVo> selectPageByDeptIds(@Param("page") Page<XgStudentMsgVo> page,
+                        @Param("ew") LambdaQueryWrapper<XgStudentMsg> queryWrapper,
+                        @Param("deptIds") List<Long> deptIds);
 
-    /**
-     * 根据班级ID和姓名查询学生信息列表
-     *
-     * @param classId 班级ID
-     * @param name    学生姓名（模糊查询）
-     * @return 学生信息列表
-     */
-    List<XgStudentMsgVo> selectStudentsByClassId(@Param("classId") String classId, @Param("name") String name);
+        /**
+         * 根据班级ID和姓名查询学生信息列表
+         *
+         * @param classId 班级ID
+         * @param name    学生姓名（模糊查询）
+         * @return 学生信息列表
+         */
+        List<XgStudentMsgVo> selectStudentsByClassId(@Param("classId") String classId, @Param("name") String name);
 
-    /**
-     * 根据学生ID查询班主任ID
-     *
-     * @param studentId 学生ID
-     * @return 班主任ID
-     */
-    Long selectClassTeacherIdByStudentId(@Param("studentId") Long studentId);
+        /**
+         * 根据学生ID查询班主任ID
+         *
+         * @param studentId 学生ID
+         * @return 班主任ID
+         */
+        Long selectClassTeacherIdByStudentId(@Param("studentId") Long studentId);
 
-    /**
-     * 根据学生ID查询学院ID
-     *
-     * @param studentId 学生ID
-     * @return 学院ID
-     */
-    Long selectCollegeIdByStudentId(@Param("studentId") Long studentId);
+        /**
+         * 根据学生ID查询学院ID
+         *
+         * @param studentId 学生ID
+         * @return 学院ID
+         */
+        Long selectCollegeIdByStudentId(@Param("studentId") Long studentId);
 
-    /**
-     * 根据学院ID和角色Key查询具备该角色的用户列表
-     *
-     * @param collegeId 学院ID
-     * @param roleKey   角色Key
-     * @return 用户ID列表
-     */
-    List<Long> selectUserIdsByCollegeIdAndRoleKey(@Param("collegeId") Long collegeId,
-            @Param("roleKey") String roleKey);
+        /**
+         * 根据学院ID和角色Key查询具备该角色的用户列表
+         *
+         * @param collegeId 学院ID
+         * @param roleKey   角色Key
+         * @return 用户ID列表
+         */
+        List<Long> selectUserIdsByCollegeIdAndRoleKey(@Param("collegeId") Long collegeId,
+                        @Param("roleKey") String roleKey);
 
-    /**
-     * 查询二级学院下的学院、专业、班级学生统计信息
-     *
-     * @param secondaryCollegeId 二级学院ID
-     * @return 学生统计信息列表
-     */
-    List<Map<String, Object>> getCollegeStudentStats(@Param("secondaryCollegeId") Long secondaryCollegeId);
+        /**
+         * 根据学院ID查询二级学院分管领导ID列表
+         *
+         * @param collegeId 学院ID
+         * @return 分管领导ID列表
+         */
+        List<Long> selectCollegeLeaderIdsByCollegeId(@Param("collegeId") Long collegeId);
 
-    /**
-     * 查询二级学院下的学院、专业、班级学生统计信息（按床位分配统计）
-     *
-     * @param secondaryCollegeId 二级学院ID
-     * @return 学生统计信息列表
-     */
-    List<Map<String, Object>> getCollegeStudentStatsByClass(@Param("secondaryCollegeId") Long secondaryCollegeId);
+        /**
+         * 查询二级学院下的学院、专业、班级学生统计信息
+         *
+         * @param secondaryCollegeId 二级学院ID
+         * @return 学生统计信息列表
+         */
+        List<Map<String, Object>> getCollegeStudentStats(@Param("secondaryCollegeId") Long secondaryCollegeId);
 
-    /**
-     * 查询二级学院下的学院床位分配统计信息（基于college_id统计）
-     *
-     * @param secondaryCollegeId 二级学院ID
-     * @return 学院床位分配统计信息列表
-     */
-    List<Map<String, Object>> getCollegeBedAssignmentStats(@Param("secondaryCollegeId") Long secondaryCollegeId);
+        /**
+         * 查询二级学院下的学院、专业、班级学生统计信息（按床位分配统计）
+         *
+         * @param secondaryCollegeId 二级学院ID
+         * @return 学生统计信息列表
+         */
+        List<Map<String, Object>> getCollegeStudentStatsByClass(@Param("secondaryCollegeId") Long secondaryCollegeId);
+
+        /**
+         * 查询二级学院下的学院床位分配统计信息（基于college_id统计）
+         *
+         * @param secondaryCollegeId 二级学院ID
+         * @return 学院床位分配统计信息列表
+         */
+        List<Map<String, Object>> getCollegeBedAssignmentStats(@Param("secondaryCollegeId") Long secondaryCollegeId);
 
 }

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgCollegeLeaderService.java

@@ -0,0 +1,76 @@
+package org.dromara.xg.service;
+
+import org.dromara.xg.domain.vo.XgCollegeLeaderVo;
+import org.dromara.xg.domain.bo.XgCollegeLeaderBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 二级学院分管领导配置Service接口
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+public interface IXgCollegeLeaderService {
+
+    /**
+     * 查询二级学院分管领导配置
+     *
+     * @param id 主键
+     * @return 二级学院分管领导配置
+     */
+    XgCollegeLeaderVo queryById(Long id);
+
+    /**
+     * 分页查询二级学院分管领导配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 二级学院分管领导配置分页列表
+     */
+    TableDataInfo<XgCollegeLeaderVo> queryPageList(XgCollegeLeaderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的二级学院分管领导配置列表
+     *
+     * @param bo 查询条件
+     * @return 二级学院分管领导配置列表
+     */
+    List<XgCollegeLeaderVo> queryList(XgCollegeLeaderBo bo);
+
+    /**
+     * 新增二级学院分管领导配置
+     *
+     * @param bo 二级学院分管领导配置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XgCollegeLeaderBo bo);
+
+    /**
+     * 修改二级学院分管领导配置
+     *
+     * @param bo 二级学院分管领导配置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XgCollegeLeaderBo bo);
+
+    /**
+     * 校验并批量删除二级学院分管领导配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据学院ID查询分管领导列表
+     *
+     * @param collegeId 学院ID
+     * @return 分管领导列表
+     */
+    List<XgCollegeLeaderVo> queryByCollegeId(Long collegeId);
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentMsgService.java

@@ -140,6 +140,14 @@ public interface IXgStudentMsgService {
      */
     List<Long> getCollegeLeaveApproversByStudentId(Long studentId);
 
+    /**
+     * 根据学生ID获取二级学院分管领导ID列表
+     *
+     * @param studentId 学生ID
+     * @return 分管领导ID列表
+     */
+    List<Long> getCollegeLeadersByStudentId(Long studentId);
+
     /**
      * 批量申请床位
      *

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgCollegeLeaderServiceImpl.java

@@ -0,0 +1,163 @@
+package org.dromara.xg.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.dromara.xg.domain.bo.XgCollegeLeaderBo;
+import org.dromara.xg.domain.vo.XgCollegeLeaderVo;
+import org.dromara.xg.domain.XgCollegeLeader;
+import org.dromara.xg.mapper.XgCollegeLeaderMapper;
+import org.dromara.xg.service.IXgCollegeLeaderService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 二级学院分管领导配置Service业务层处理
+ *
+ * @author Cursor AI
+ * @date 2025-01-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class XgCollegeLeaderServiceImpl implements IXgCollegeLeaderService {
+
+    private final XgCollegeLeaderMapper baseMapper;
+
+    /**
+     * 查询二级学院分管领导配置
+     *
+     * @param id 主键
+     * @return 二级学院分管领导配置
+     */
+    @Override
+    public XgCollegeLeaderVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询二级学院分管领导配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 二级学院分管领导配置分页列表
+     */
+    @Override
+    public TableDataInfo<XgCollegeLeaderVo> queryPageList(XgCollegeLeaderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XgCollegeLeader> lqw = buildQueryWrapper(bo);
+        Page<XgCollegeLeaderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的二级学院分管领导配置列表
+     *
+     * @param bo 查询条件
+     * @return 二级学院分管领导配置列表
+     */
+    @Override
+    public List<XgCollegeLeaderVo> queryList(XgCollegeLeaderBo bo) {
+        LambdaQueryWrapper<XgCollegeLeader> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据学院ID查询分管领导列表
+     *
+     * @param collegeId 学院ID
+     * @return 分管领导列表
+     */
+    @Override
+    public List<XgCollegeLeaderVo> queryByCollegeId(Long collegeId) {
+        LambdaQueryWrapper<XgCollegeLeader> lqw = Wrappers.lambdaQuery();
+        lqw.eq(XgCollegeLeader::getCollegeId, collegeId);
+        lqw.orderByDesc(XgCollegeLeader::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XgCollegeLeader> buildQueryWrapper(XgCollegeLeaderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XgCollegeLeader> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCollegeId() != null, XgCollegeLeader::getCollegeId, bo.getCollegeId());
+        lqw.like(StringUtils.isNotBlank(bo.getCollegeName()), XgCollegeLeader::getCollegeName, bo.getCollegeName());
+        lqw.eq(bo.getLeaderId() != null, XgCollegeLeader::getLeaderId, bo.getLeaderId());
+        lqw.like(StringUtils.isNotBlank(bo.getLeaderName()), XgCollegeLeader::getLeaderName, bo.getLeaderName());
+        lqw.orderByDesc(XgCollegeLeader::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增二级学院分管领导配置
+     *
+     * @param bo 二级学院分管领导配置
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(XgCollegeLeaderBo bo) {
+        XgCollegeLeader add = MapstructUtils.convert(bo, XgCollegeLeader.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改二级学院分管领导配置
+     *
+     * @param bo 二级学院分管领导配置
+     * @return 是否修改成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(XgCollegeLeaderBo bo) {
+        XgCollegeLeader update = MapstructUtils.convert(bo, XgCollegeLeader.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XgCollegeLeader entity) {
+        // 校验是否已存在相同的配置
+        LambdaQueryWrapper<XgCollegeLeader> lqw = Wrappers.lambdaQuery();
+        lqw.eq(XgCollegeLeader::getCollegeId, entity.getCollegeId());
+        lqw.eq(XgCollegeLeader::getLeaderId, entity.getLeaderId());
+        if (entity.getId() != null) {
+            lqw.ne(XgCollegeLeader::getId, entity.getId());
+        }
+        long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new RuntimeException("该学院已配置此分管领导，不能重复配置！");
+        }
+    }
+
+    /**
+     * 校验并批量删除二级学院分管领导配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java

@@ -1095,6 +1095,32 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService {
         return approverUserIds;
     }
 
+    /**
+     * 根据学生ID获取二级学院分管领导ID列表
+     *
+     * @param studentId 学生ID
+     * @return 分管领导ID列表
+     */
+    @Override
+    public List<Long> getCollegeLeadersByStudentId(Long studentId) {
+        log.info("根据学生ID获取二级学院分管领导ID列表 - 学生ID: {}", studentId);
+
+        // 1. 根据学生ID查询学院ID
+        Long collegeId = baseMapper.selectCollegeIdByStudentId(studentId);
+        if (collegeId == null) {
+            log.warn("未找到学生对应的学院信息 - 学生ID: {}", studentId);
+            return new ArrayList<>();
+        }
+
+        log.info("学生所在学院ID: {}", collegeId);
+
+        // 2. 根据学院ID查询二级学院分管领导ID列表
+        List<Long> leaderIds = baseMapper.selectCollegeLeaderIdsByCollegeId(collegeId);
+
+        log.info("找到的二级学院分管领导数量: {}", leaderIds.size());
+        return leaderIds;
+    }
+
     /**
      * 批量申请床位
      *

backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/ejxyfgld/XgCollegeLeaderMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.xg.mapper.XgCollegeLeaderMapper">
+
+</mapper>
+

backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/studentMsg/XgStudentMsgMapper.xml

@@ -171,6 +171,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND (d.dept_id = #{collegeId} OR FIND_IN_SET(#{collegeId}, d.ancestors))
     </select>
 
+    <!-- 根据学院ID查询二级学院分管领导ID列表 -->
+    <select id="selectCollegeLeaderIdsByCollegeId" resultType="java.lang.Long">
+        SELECT leader_id
+        FROM xg_college_leader
+        WHERE college_id = #{collegeId}
+          AND deleted = 0
+    </select>
+
     <!-- 查询二级学院下的学院、专业、班级学生统计信息 -->
     <select id="getCollegeStudentStats" resultType="java.util.Map">
         SELECT

backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/xg/XgSysUserMapper.xml

@@ -6,10 +6,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="org.dromara.xg.domain.XgSysUser" id="XgSysUserResult">
         <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="accountType" column="account_type"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -18,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询有效用户列表 -->
     <select id="selectActiveUserList" resultMap="XgSysUserResult">
-        select user_id, nick_name, phonenumber
+        select user_id, user_name, nick_name, phonenumber, account_type
         from sys_user
         where status = '0' and del_flag = '0'
         order by create_time desc
@@ -26,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 根据账户类型查询有效用户列表 -->
     <select id="selectActiveUserListByAccountType" parameterType="String" resultMap="XgSysUserResult">
-        select user_id, nick_name, phonenumber
+        select user_id, user_name, nick_name, phonenumber, account_type
         from sys_user
         where status = '0' and del_flag = '0' and account_type = #{accountType}
         order by create_time desc

backend/script/sql/ry_workflow.sql

@@ -1,4 +1,104 @@
+-- ----------------------------
+-- 0、warm-flow-all.sql，地址：https://gitee.com/dromara/warm-flow/blob/master/sql/mysql/warm-flow-all.sql
+-- ----------------------------
+CREATE TABLE `flow_definition`
+(
+    `id`              bigint          NOT NULL COMMENT '主键id',
+    `flow_code`       varchar(40)     NOT NULL COMMENT '流程编码',
+    `flow_name`       varchar(100)    NOT NULL COMMENT '流程名称',
+    `category`        varchar(100)             DEFAULT NULL COMMENT '流程类别',
+    `version`         varchar(20)     NOT NULL COMMENT '流程版本',
+    `is_publish`      tinyint(1)      NOT NULL DEFAULT '0' COMMENT '是否发布（0未发布 1已发布 9失效）',
+    `form_custom`     char(1)                  DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`       varchar(100)             DEFAULT NULL COMMENT '审批表单路径',
+    `activity_status` tinyint(1)      NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）',
+    `listener_type`   varchar(100)             DEFAULT NULL COMMENT '监听器类型',
+    `listener_path`   varchar(400)             DEFAULT NULL COMMENT '监听器路径',
+    `ext`             varchar(500)             DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串',
+    `create_time`     datetime                 DEFAULT NULL COMMENT '创建时间',
+    `update_time`     datetime                 DEFAULT NULL COMMENT '更新时间',
+    `del_flag`        char(1)                  DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`       varchar(40)              DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程定义表';
 
+CREATE TABLE `flow_node`
+(
+    `id`              bigint        NOT NULL COMMENT '主键id',
+    `node_type`       tinyint(1)      NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `definition_id`   bigint          NOT NULL COMMENT '流程定义id',
+    `node_code`       varchar(100)    NOT NULL COMMENT '流程节点编码',
+    `node_name`       varchar(100)  DEFAULT NULL COMMENT '流程节点名称',
+    `permission_flag` varchar(200)  DEFAULT NULL COMMENT '权限标识（权限类型:权限标识，可以多个，用逗号隔开)',
+    `node_ratio`      decimal(6, 3) DEFAULT NULL COMMENT '流程签署比例值',
+    `coordinate`      varchar(100)  DEFAULT NULL COMMENT '坐标',
+    `any_node_skip`   varchar(100)  DEFAULT NULL COMMENT '任意结点跳转',
+    `listener_type`   varchar(100)  DEFAULT NULL COMMENT '监听器类型',
+    `listener_path`   varchar(400)  DEFAULT NULL COMMENT '监听器路径',
+    `handler_type`    varchar(100)  DEFAULT NULL COMMENT '处理器类型',
+    `handler_path`    varchar(400)  DEFAULT NULL COMMENT '处理器路径',
+    `form_custom`     char(1)       DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`       varchar(100)  DEFAULT NULL COMMENT '审批表单路径',
+    `version`         varchar(20)     NOT NULL COMMENT '版本',
+    `create_time`     datetime      DEFAULT NULL COMMENT '创建时间',
+    `update_time`     datetime      DEFAULT NULL COMMENT '更新时间',
+    `ext`             text          COMMENT '扩展属性',
+    `del_flag`        char(1)       DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`       varchar(40)   DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程节点表';
+
+CREATE TABLE `flow_skip`
+(
+    `id`             bigint       NOT NULL COMMENT '主键id',
+    `definition_id`  bigint          NOT NULL COMMENT '流程定义id',
+    `now_node_code`  varchar(100)    NOT NULL COMMENT '当前流程节点的编码',
+    `now_node_type`  tinyint(1)   DEFAULT NULL COMMENT '当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `next_node_code` varchar(100)    NOT NULL COMMENT '下一个流程节点的编码',
+    `next_node_type` tinyint(1)   DEFAULT NULL COMMENT '下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `skip_name`      varchar(100) DEFAULT NULL COMMENT '跳转名称',
+    `skip_type`      varchar(40)  DEFAULT NULL COMMENT '跳转类型（PASS审批通过 REJECT退回）',
+    `skip_condition` varchar(200) DEFAULT NULL COMMENT '跳转条件',
+    `coordinate`     varchar(100) DEFAULT NULL COMMENT '坐标',
+    `create_time`    datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_time`    datetime     DEFAULT NULL COMMENT '更新时间',
+    `del_flag`       char(1)      DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`      varchar(40)  DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='节点跳转关联表';
+
+CREATE TABLE `flow_instance`
+(
+    `id`              bigint      NOT NULL COMMENT '主键id',
+    `definition_id`   bigint      NOT NULL COMMENT '对应flow_definition表的id',
+    `business_id`     varchar(40) NOT NULL COMMENT '业务id',
+    `node_type`       tinyint(1)  NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `node_code`       varchar(40) NOT NULL COMMENT '流程节点编码',
+    `node_name`       varchar(100)         DEFAULT NULL COMMENT '流程节点名称',
+    `variable`        text COMMENT '任务变量',
+    `flow_status`     varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+    `activity_status` tinyint(1)  NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）',
+    `def_json`        text COMMENT '流程定义json',
+    `create_by`       varchar(64)          DEFAULT '' COMMENT '创建者',
+    `create_time`     datetime             DEFAULT NULL COMMENT '创建时间',
+    `update_time`     datetime             DEFAULT NULL COMMENT '更新时间',
+    `ext`             varchar(500)         DEFAULT NULL COMMENT '扩展字段，预留给业务系统使用',
+    `del_flag`        char(1)              DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`       varchar(40)          DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程实例表';
+
+CREATE TABLE `flow_task`
+(
+    `id`            bigint       NOT NULL COMMENT '主键id',
+    `definition_id` bigint       NOT NULL COMMENT '对应flow_definition表的id',
+    `instance_id`   bigint       NOT NULL COMMENT '对应flow_instance表的id',
+    `node_code`     varchar(100) NOT NULL COMMENT '节点编码',
+    `node_name`     varchar(100) DEFAULT NULL COMMENT '节点名称',
+    `node_type`     tinyint(1)   NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `flow_status`   varchar(20)  NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+    `form_custom`   char(1)      DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`     varchar(100) DEFAULT NULL COMMENT '审批表单路径',
     `create_time`   datetime     DEFAULT NULL COMMENT '创建时间',
     `update_time`   datetime     DEFAULT NULL COMMENT '更新时间',
     `del_flag`      char(1)      DEFAULT '0' COMMENT '删除标志',

target/classes/META-INF/mps/mappers

@@ -1,59 +0,0 @@
-org.dromara.system.domain.vo.SysSocialVoToSysSocialMapper
-org.dromara.system.domain.vo.SysDictDataVoToSysDictDataMapper
-org.dromara.system.domain.SysOssConfigToSysOssConfigVoMapper
-org.dromara.system.domain.vo.SysLogininforVoToSysLogininforMapper
-org.dromara.system.domain.bo.SysConfigBoToSysConfigMapper
-org.dromara.system.domain.SysTenantPackageToSysTenantPackageVoMapper
-org.dromara.system.domain.bo.SysPostBoToSysPostMapper
-org.dromara.system.domain.vo.SysOssConfigVoToSysOssConfigMapper
-org.dromara.system.domain.SysUserToSysUserVoMapper
-org.dromara.system.domain.vo.SysDictTypeVoToSysDictTypeMapper
-org.dromara.system.domain.SysRegionToSysRegionVoMapper
-org.dromara.system.domain.SysDictDataToSysDictDataVoMapper
-org.dromara.system.domain.bo.SysMenuBoToSysMenuMapper
-org.dromara.system.domain.bo.SysWeChatConfigBoToSysWeChatConfigMapper
-org.dromara.system.domain.vo.SysRoleVoToSysRoleMapper
-org.dromara.system.domain.SysConfigToSysConfigVoMapper
-org.dromara.system.domain.bo.SysOperLogBoToOperLogEventMapper
-org.dromara.system.domain.vo.SysClientVoToSysClientMapper
-org.dromara.system.domain.bo.SysOssConfigBoToSysOssConfigMapper
-org.dromara.system.domain.vo.SysNoticeVoToSysNoticeMapper
-org.dromara.system.domain.bo.SysDeptBoToSysDeptMapper
-org.dromara.system.domain.bo.SysOssBoToSysOssMapper
-org.dromara.system.domain.vo.SysMenuVoToSysMenuMapper
-org.dromara.system.domain.vo.SysWeChatConfigVoToSysWeChatConfigMapper
-org.dromara.system.domain.SysMenuToSysMenuVoMapper
-org.dromara.system.domain.vo.SysTenantVoToSysTenantMapper
-org.dromara.system.domain.bo.SysUserBoToSysUserMapper
-org.dromara.system.domain.bo.SysRegionBoToSysRegionMapper
-org.dromara.system.domain.bo.SysClientBoToSysClientMapper
-org.dromara.system.domain.bo.SysDictDataBoToSysDictDataMapper
-org.dromara.system.domain.vo.SysUserVoToSysUserMapper
-org.dromara.system.domain.SysClientToSysClientVoMapper
-org.dromara.system.domain.SysNoticeToSysNoticeVoMapper
-org.dromara.system.domain.SysOssToSysOssVoMapper
-org.dromara.system.domain.SysOperLogToSysOperLogVoMapper
-org.dromara.system.domain.bo.SysLogininforBoToSysLogininforMapper
-org.dromara.system.domain.vo.SysDeptVoToSysDeptMapper
-org.dromara.system.domain.SysTenantToSysTenantVoMapper
-org.dromara.system.domain.vo.SysConfigVoToSysConfigMapper
-org.dromara.system.domain.bo.SysSocialBoToSysSocialMapper
-org.dromara.system.domain.bo.SysRoleBoToSysRoleMapper
-org.dromara.system.domain.vo.SysOssVoToSysOssMapper
-org.dromara.system.domain.SysDictTypeToSysDictTypeVoMapper
-org.dromara.system.domain.SysRoleToSysRoleVoMapper
-org.dromara.system.domain.vo.SysTenantPackageVoToSysTenantPackageMapper
-org.dromara.system.domain.bo.SysTenantBoToSysTenantMapper
-org.dromara.system.domain.bo.SysTenantPackageBoToSysTenantPackageMapper
-org.dromara.system.domain.vo.SysRegionVoToSysRegionMapper
-org.dromara.system.domain.SysLogininforToSysLogininforVoMapper
-org.dromara.system.domain.vo.SysPostVoToSysPostMapper
-org.dromara.system.domain.SysSocialToSysSocialVoMapper
-org.dromara.system.domain.bo.SysDictTypeBoToSysDictTypeMapper
-org.dromara.common.log.event.OperLogEventToSysOperLogBoMapper
-org.dromara.system.domain.SysWeChatConfigToSysWeChatConfigVoMapper
-org.dromara.system.domain.bo.SysOperLogBoToSysOperLogMapper
-org.dromara.system.domain.vo.SysOperLogVoToSysOperLogMapper
-org.dromara.system.domain.SysDeptToSysDeptVoMapper
-org.dromara.system.domain.bo.SysNoticeBoToSysNoticeMapper
-org.dromara.system.domain.SysPostToSysPostVoMapper

web/src/api/xg/college/index.ts

@@ -0,0 +1,47 @@
+import request from '@/utils/request';
+import type { AxiosPromise } from 'axios';
+import type { CollegeVo, CollegeQuery } from './types';
+
+// 导出类型
+export type { CollegeVo, MajorVo, CollegeQuery } from './types';
+
+/**
+ * 查询学院列表（用于二级学院，parent_id = 101）
+ */
+export function list(query?: any): AxiosPromise<CollegeVo[]> {
+  return request({
+    url: '/xg/college/list',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 获取学院和专业树形结构
+ */
+export function collegeTree(): AxiosPromise<CollegeVo[]> {
+  return request({
+    url: '/xg/college/tree',
+    method: 'get'
+  });
+}
+
+/**
+ * 根据学院ID获取专业列表
+ */
+export function listMajorsByCollegeId(collegeId: string | number): AxiosPromise<any[]> {
+  return request({
+    url: `/xg/college/majors/${collegeId}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 查询学院详情
+ */
+export function getCollege(deptId: string | number): AxiosPromise<CollegeVo> {
+  return request({
+    url: `/xg/college/${deptId}`,
+    method: 'get'
+  });
+}

web/src/api/xg/college/types.ts

@@ -0,0 +1,37 @@
+/**
+ * 学院信息对象
+ */
+export interface CollegeVo {
+  deptId: number | string;
+  deptName: string;
+  parentId?: number | string;
+  orderNum?: number;
+  leader?: string;
+  phone?: string;
+  email?: string;
+  status?: string;
+  children?: CollegeVo[];
+}
+
+/**
+ * 专业信息对象
+ */
+export interface MajorVo {
+  deptId: number | string;
+  deptName: string;
+  parentId: number | string;
+  orderNum?: number;
+  leader?: string;
+  phone?: string;
+  email?: string;
+  status?: string;
+}
+
+/**
+ * 学院查询参数
+ */
+export interface CollegeQuery {
+  deptName?: string;
+  status?: string;
+  parentId?: number | string;
+}

web/src/api/xg/ejxyfgld/index.ts

@@ -0,0 +1,117 @@
+import request from '@/utils/request';
+
+/**
+ * 二级学院分管领导配置对象
+ */
+export interface CollegeLeaderBo {
+  id?: number | string;
+  collegeId?: number | string;
+  collegeName?: string;
+  leaderId?: number | string;
+  leaderName?: string;
+  remark?: string;
+}
+
+/**
+ * 二级学院分管领导配置视图对象
+ */
+export interface CollegeLeaderVo {
+  id: number | string;
+  collegeId: number | string;
+  collegeName: string;
+  leaderId: number | string;
+  leaderName: string;
+  remark?: string;
+  createTime?: string;
+  updateTime?: string;
+}
+
+/**
+ * 查询二级学院分管领导配置列表
+ * @param query 查询参数
+ * @returns 返回二级学院分管领导配置列表
+ */
+export function listCollegeLeader(query: any) {
+  return request({
+    url: '/xg/ejxyfgld/list',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 根据学院ID查询分管领导列表
+ * @param collegeId 学院ID
+ * @returns 返回分管领导列表
+ */
+export function listCollegeLeaderByCollege(collegeId: number | string) {
+  return request({
+    url: `/xg/ejxyfgld/listByCollege/${collegeId}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 获取二级学院分管领导配置详情
+ * @param id 主键ID
+ * @returns 返回二级学院分管领导配置详情
+ */
+export function getCollegeLeader(id: number | string) {
+  return request({
+    url: `/xg/ejxyfgld/${id}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 新增二级学院分管领导配置
+ * @param data 二级学院分管领导配置信息
+ * @returns 返回添加结果
+ */
+export function addCollegeLeader(data: CollegeLeaderBo) {
+  return request({
+    url: '/xg/ejxyfgld',
+    method: 'post',
+    data: data
+  });
+}
+
+/**
+ * 修改二级学院分管领导配置
+ * @param data 二级学院分管领导配置信息
+ * @returns 返回修改结果
+ */
+export function updateCollegeLeader(data: CollegeLeaderBo) {
+  return request({
+    url: '/xg/ejxyfgld',
+    method: 'put',
+    data: data
+  });
+}
+
+/**
+ * 删除二级学院分管领导配置
+ * @param ids 主键ID数组
+ * @returns 返回删除结果
+ */
+export function delCollegeLeader(ids: number | string | (number | string)[]) {
+  return request({
+    url: `/xg/ejxyfgld/${ids instanceof Array ? ids.join(',') : ids}`,
+    method: 'delete'
+  });
+}
+
+/**
+ * 导出二级学院分管领导配置
+ * @param query 查询参数
+ * @returns 返回导出结果
+ */
+export function exportCollegeLeader(query: any) {
+  return request({
+    url: '/xg/ejxyfgld/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+}
+

web/src/api/xg/sysUser.ts

@@ -6,16 +6,17 @@ import { AxiosPromise } from 'axios';
  */
 export interface XgSysUser {
   userId: number | string;
-  userName: string;
+  userName?: string;
   nickName: string;
-  email: string;
+  email?: string;
   phonenumber: string;
-  sex: string;
-  status: string;
-  createTime: string;
-  updateTime: string;
-  deptId: number;
-  deptName: string;
+  sex?: string;
+  status?: string;
+  accountType?: string;
+  createTime?: string;
+  updateTime?: string;
+  deptId?: number;
+  deptName?: string;
 }
 
 /**
@@ -27,3 +28,8 @@ export function getActiveUserList(): AxiosPromise<XgSysUser[]> {
     method: 'get'
   });
 }
+
+/**
+ * 查询有效用户列表（别名，用于兼容）
+ */
+export const activeList = getActiveUserList;

web/src/api/xg/xsjcxx/studentMsg/studentMsg/index.ts

@@ -106,3 +106,14 @@ export const getCollegeLeaveApprovers = (studentId: string | number): AxiosPromi
     method: 'get'
   });
 };
+
+/**
+ * 根据学生ID获取二级学院分管领导ID列表
+ * @param studentId 学生ID
+ */
+export const getCollegeLeaders = (studentId: string | number): AxiosPromise<{ data: number[] }> => {
+  return request({
+    url: `/studentMsg/studentMsg/getCollegeLeaders/${studentId}`,
+    method: 'get'
+  });
+};

web/src/views/xg/ejxyfgld/index.vue

@@ -0,0 +1,322 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" label-width="100px" :inline="true">
+            <el-form-item label="学院名称" prop="collegeName">
+              <el-input v-model="queryParams.collegeName" placeholder="请输入学院名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="领导姓名" prop="leaderName">
+              <el-input v-model="queryParams.leaderName" placeholder="请输入领导姓名" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['xg:ejxyfgld:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['xg:ejxyfgld:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['xg:ejxyfgld:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="collegeLeaderList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="学院名称" align="center" prop="collegeName" />
+        <el-table-column label="领导姓名" align="center" prop="leaderName" />
+        <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['xg:ejxyfgld:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['xg:ejxyfgld:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改二级学院分管领导对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body>
+      <el-form ref="collegeLeaderFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="二级学院" prop="collegeId">
+          <el-select v-model="form.collegeId" placeholder="请选择二级学院" clearable filterable style="width: 100%" @change="handleCollegeChange">
+            <el-option v-for="college in collegeList" :key="college.deptId" :label="college.deptName" :value="college.deptId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分管领导" prop="leaderId">
+          <el-select v-model="form.leaderId" placeholder="请选择分管领导" clearable filterable style="width: 100%" @change="handleLeaderChange">
+            <el-option v-for="user in teacherList" :key="user.userId" :label="`${user.nickName}(${user.userName})`" :value="user.userId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注信息" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="CollegeLeader" lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue';
+import type { FormInstance } from 'element-plus';
+import {
+  listCollegeLeader,
+  getCollegeLeader,
+  addCollegeLeader,
+  updateCollegeLeader,
+  delCollegeLeader,
+  exportCollegeLeader,
+  type CollegeLeaderBo,
+  type CollegeLeaderVo
+} from '@/api/xg/ejxyfgld';
+import { list as listCollege } from '@/api/xg/college';
+import { activeList as listTeacher } from '@/api/xg/sysUser';
+
+interface ComponentInternalInstance {
+  proxy?: any;
+}
+
+interface DialogOption {
+  visible: boolean;
+  title: string;
+}
+
+interface QueryParams {
+  pageNum: number;
+  pageSize: number;
+  collegeName?: string;
+  leaderName?: string;
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const collegeLeaderList = ref<CollegeLeaderVo[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+// 学院列表和教师列表
+const collegeList = ref<any[]>([]);
+const teacherList = ref<any[]>([]);
+
+const queryFormRef = ref<FormInstance>();
+const collegeLeaderFormRef = ref<FormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: CollegeLeaderBo = {
+  id: undefined,
+  collegeId: undefined,
+  collegeName: undefined,
+  leaderId: undefined,
+  leaderName: undefined,
+  remark: undefined
+};
+
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    collegeName: undefined,
+    leaderName: undefined
+  } as QueryParams,
+  rules: {
+    collegeId: [{ required: true, message: '二级学院不能为空', trigger: 'change' }],
+    leaderId: [{ required: true, message: '分管领导不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询二级学院分管领导列表 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listCollegeLeader(queryParams.value);
+    collegeLeaderList.value = res.rows;
+    total.value = res.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 加载学院列表 */
+const loadCollegeList = async () => {
+  try {
+    const res = await listCollege();
+    collegeList.value = res.data || [];
+  } catch (error) {
+    console.error('加载学院列表失败:', error);
+  }
+};
+
+/** 加载教师列表 */
+const loadTeacherList = async () => {
+  try {
+    const res = await listTeacher();
+    // 后端已经过滤出教职工（account_type = 1），直接使用
+    teacherList.value = res.data || [];
+    console.log('加载教师列表成功，共', teacherList.value.length, '条数据');
+  } catch (error) {
+    console.error('加载教师列表失败:', error);
+  }
+};
+
+/** 学院选择变更 */
+const handleCollegeChange = (val: any) => {
+  const college = collegeList.value.find((c: any) => c.deptId === val);
+  if (college) {
+    form.value.collegeName = college.deptName;
+  }
+};
+
+/** 领导选择变更 */
+const handleLeaderChange = (val: any) => {
+  const teacher = teacherList.value.find((t: any) => t.userId === val);
+  if (teacher) {
+    form.value.leaderName = teacher.nickName;
+  }
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  collegeLeaderFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CollegeLeaderVo[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = async () => {
+  reset();
+  await loadCollegeList();
+  await loadTeacherList();
+  dialog.visible = true;
+  dialog.title = '添加二级学院分管领导';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CollegeLeaderVo) => {
+  reset();
+  await loadCollegeList();
+  await loadTeacherList();
+  const id = row?.id || ids.value[0];
+  const res = await getCollegeLeader(id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改二级学院分管领导';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  collegeLeaderFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        if (form.value.id) {
+          await updateCollegeLeader(form.value);
+          proxy?.$modal.msgSuccess('修改成功');
+        } else {
+          await addCollegeLeader(form.value);
+          proxy?.$modal.msgSuccess('新增成功');
+        }
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('提交失败:', error);
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CollegeLeaderVo) => {
+  const deleteIds = row?.id ? [row.id] : ids.value;
+  await proxy?.$modal.confirm('是否确认删除选中的配置？');
+  try {
+    await delCollegeLeader(deleteIds);
+    await getList();
+    proxy?.$modal.msgSuccess('删除成功');
+  } catch (error) {
+    console.error('删除失败:', error);
+  }
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.$download(
+    'xg/ejxyfgld/export',
+    {
+      ...queryParams.value
+    },
+    `二级学院分管领导_${new Date().getTime()}.xlsx`
+  );
+};
+
+// 初始化
+getList();
+</script>
+
+<style scoped lang="scss"></style>

web/src/views/xg/xsjcxx/xsqj/dialog.vue

@@ -307,7 +307,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { AxiosResponse } from 'axios';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 import { addStudentLeave, getStudentLeave, updateStudentLeave } from '@/api/workflow/studentLeave/studentLeave';
-import { getStudentMsg, getClassTeacherId, getCollegeLeaveApprovers } from '@/api/xg/xsjcxx/studentMsg/studentMsg';
+import { getStudentMsg, getClassTeacherId, getCollegeLeaveApprovers, getCollegeLeaders } from '@/api/xg/xsjcxx/studentMsg/studentMsg';
 import { startWorkFlow } from '@/api/workflow/task';
 import { StudentLeaveForm, StudentLeaveVO } from '@/api/workflow/studentLeave/studentLeave/types';
 import { StudentMsgVO } from '@/api/xg/xsjcxx/studentMsg/studentMsg/types';
@@ -890,7 +890,7 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
     // 1. 调用接口获取班主任ID
     let classTeacherId: number | null = null;
     try {
-      const classTeacherResponse = await getClassTeacherId(data.studentId);
+      const classTeacherResponse: any = await getClassTeacherId(data.studentId);
       if (classTeacherResponse && classTeacherResponse.data) {
         classTeacherId = classTeacherResponse.data;
         console.log('获取到班主任ID:', classTeacherId);
@@ -908,7 +908,7 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
     // 2. 调用接口获取学院请假审批人列表
     let collegeApprovers: number[] = [];
     try {
-      const collegeApproversResponse = await getCollegeLeaveApprovers(data.studentId);
+      const collegeApproversResponse: any = await getCollegeLeaveApprovers(data.studentId);
       if (collegeApproversResponse && collegeApproversResponse.data) {
         collegeApprovers = collegeApproversResponse.data;
         console.log('获取到学院请假审批人列表:', collegeApprovers);
@@ -923,6 +923,24 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
       return; // 停止后续操作
     }
 
+    // 3. 调用接口获取二级学院分管领导ID列表
+    let collegeLeaders: number[] = [];
+    try {
+      const collegeLeadersResponse: any = await getCollegeLeaders(data.studentId);
+      if (collegeLeadersResponse && collegeLeadersResponse.data) {
+        collegeLeaders = collegeLeadersResponse.data;
+        console.log('获取到二级学院分管领导ID列表:', collegeLeaders);
+      } else {
+        console.warn('获取二级学院分管领导ID列表失败');
+        ElMessage.error('获取二级学院分管领导信息失败，请稍后重试');
+        return; // 停止后续操作
+      }
+    } catch (error) {
+      console.error('调用获取二级学院分管领导接口失败:', error);
+      ElMessage.error('获取二级学院分管领导信息失败，请稍后重试');
+      return; // 停止后续操作
+    }
+
     submitFormData.value.flowCode = flowCode.value;
     submitFormData.value.businessId = data.id;
     // 流程变量
@@ -935,7 +953,8 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
       // userList: ['1', '3', '4'],
       // 新增的流程变量
       bzrspr: classTeacherId,
-      ejxyspr: collegeApprovers
+      ejxyspr: collegeApprovers,
+      ejxyfgld: collegeLeaders
     };
     submitFormData.value.variables = taskVariables.value;
     const resp = await startWorkFlow(submitFormData.value);