提交代码

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'
+  });
+};