Merge branch 'master' of http://47.99.164.66:3000/hzdyjs-xg/all-project

web/src/api/stgl/activity/index.ts

@@ -1,6 +1,14 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { StglActivityVO, StglActivityForm, StglActivityQuery, ClubOption, ActivityCopyParams, ActivitySummaryParams, ActivityRatingVO } from './types';
+import {
+  StglActivityVO,
+  StglActivityForm,
+  StglActivityQuery,
+  ClubOption,
+  ActivityCopyParams,
+  ActivitySummaryParams,
+  ActivityRatingVO
+} from './types';
 
 /**
  * 查询活动信息列表
@@ -137,4 +145,4 @@ export const getActivityRatings = (activityId: string | number): AxiosPromise<Ac
     url: '/stgl/activity/' + activityId + '/ratings',
     method: 'get'
   });
-}; 
+};

web/src/api/stgl/activity/types.ts

@@ -478,6 +478,11 @@ export interface StglActivityQuery extends PageQuery {
    */
   isFinished?: number;
 
+  /**
+   * 创建者ID
+   */
+  createBy?: string | number;
+
   /**
    * 日期范围参数
    */

web/src/api/stgl/activityattendance/index.ts

@@ -118,4 +118,4 @@ export const signOut = (data: StglActivityAttendanceForm) => {
     method: 'post',
     data: data
   });
-}; 
+};

web/src/api/stgl/activityattendance/types.ts

@@ -329,4 +329,4 @@ export interface StglActivityAttendanceQuery {
    * 日期范围参数
    */
   params?: any;
-} 
+}

web/src/api/stgl/activitymaterial/index.ts

@@ -299,4 +299,4 @@ export function batchReviewSubmissions(ids: string, reviewStatus: number, review
     method: 'put',
     params: params
   });
-} 
+}

web/src/api/stgl/activitymaterial/types.ts

@@ -533,4 +533,4 @@ export interface MaterialTypeOption {
    * 是否选中
    */
   checked?: boolean;
-} 
+}

web/src/api/stgl/activityregister/index.ts

@@ -12,7 +12,7 @@ export const listActivityRegister = (query?: any): AxiosPromise<StglActivityRegi
   return request({
     url: '/stgl/activity/register/list',
     method: 'get',
-    params: query,
+    params: query
   });
 };
 
@@ -23,7 +23,7 @@ export const listActivityRegister = (query?: any): AxiosPromise<StglActivityRegi
 export const getActivityRegister = (id: string | number): AxiosPromise<StglActivityRegistrationVo> => {
   return request({
     url: '/stgl/activity/register/' + id,
-    method: 'get',
+    method: 'get'
   });
 };
 
@@ -35,7 +35,7 @@ export const addActivityRegister = (data: StglActivityRegistrationForm) => {
   return request({
     url: '/stgl/activity/register',
     method: 'post',
-    data: data,
+    data: data
   });
 };
 
@@ -47,7 +47,7 @@ export const updateActivityRegister = (data: StglActivityRegistrationForm) => {
   return request({
     url: '/stgl/activity/register',
     method: 'put',
-    data: data,
+    data: data
   });
 };
 
@@ -58,7 +58,7 @@ export const updateActivityRegister = (data: StglActivityRegistrationForm) => {
 export const delActivityRegister = (id: string | number | Array<string | number>) => {
   return request({
     url: '/stgl/activity/register/' + id,
-    method: 'delete',
+    method: 'delete'
   });
 };
 
@@ -74,8 +74,8 @@ export const approveActivityRegister = (id: string | number, approvalStatus: num
     method: 'post',
     params: {
       approvalStatus,
-      approvalRemark,
-    },
+      approvalRemark
+    }
   });
 };
 
@@ -92,8 +92,8 @@ export const batchApproveActivityRegister = (ids: Array<string | number>, approv
     data: {
       ids,
       approvalStatus,
-      approvalRemark,
-    },
+      approvalRemark
+    }
   });
 };
 
@@ -121,7 +121,7 @@ export const recordActivityScore = (id: string | number, score: string) => {
     url: `/stgl/activity/register/score/${id}`,
     method: 'post',
     params: {
-      score,
-    },
+      score
+    }
   });
-}; 
+};

web/src/api/stgl/activityregister/types.ts

@@ -341,4 +341,4 @@ export interface TeamMemberInfo {
 export interface PageQuery {
   pageNum?: number;
   pageSize?: number;
-} 
+}

web/src/api/stgl/activityregisterhall/index.ts

@@ -11,7 +11,7 @@ export const listRegistrableActivities = (query?: any): AxiosPromise<StglActivit
   return request({
     url: '/stgl/activity/registerhall/list',
     method: 'get',
-    params: query,
+    params: query
   });
 };
 
@@ -22,7 +22,7 @@ export const listRegistrableActivities = (query?: any): AxiosPromise<StglActivit
 export const getActivityDetail = (id: string | number): AxiosPromise<StglActivityVo> => {
   return request({
     url: '/stgl/activity/registerhall/' + id,
-    method: 'get',
+    method: 'get'
   });
 };
 
@@ -34,7 +34,7 @@ export const registerActivity = (data: StglActivityRegistrationForm) => {
   return request({
     url: '/stgl/activity/registerhall/register',
     method: 'post',
-    data: data,
+    data: data
   });
 };
 
@@ -45,7 +45,7 @@ export const registerActivity = (data: StglActivityRegistrationForm) => {
 export const checkRegistration = (activityId: string | number): AxiosPromise<boolean> => {
   return request({
     url: `/stgl/activity/registerhall/checkRegistration/${activityId}`,
-    method: 'get',
+    method: 'get'
   });
 };
 
@@ -57,6 +57,6 @@ export const getMyRegistrations = (query?: any): AxiosPromise<StglActivityRegist
   return request({
     url: '/stgl/activity/registerhall/myRegistrations',
     method: 'get',
-    params: query,
+    params: query
   });
-}; 
+};

web/src/api/stgl/activityregisterhall/types.ts

@@ -422,4 +422,4 @@ export interface TeamMemberInfo {
    * 是否为队长（0-否 1-是）
    */
   isLeader: number;
-} 
+}

web/src/api/stgl/club/index.ts

@@ -120,3 +120,22 @@ export const checkPresidentRole = (id: string | number) => {
     }
   });
 };
+
+/**
+ * 修改社团报名开启状态
+ * @param id 社团ID
+ * @param sighOpen 报名开启状态(Y/N)
+ */
+export const changeSighOpenStatus = (id: string | number, sighOpen: string) => {
+  return request({
+    url: '/stgl/club/changeSighOpenStatus',
+    method: 'put',
+    params: {
+      id,
+      sighOpen
+    },
+    headers: {
+      isEncrypt: 'true'
+    }
+  });
+};

web/src/api/stgl/club/types.ts

@@ -189,6 +189,11 @@ export interface StglClubVO {
    */
   status: string;
 
+  /**
+   * 是否开启报名
+   */
+  sighOpen: string;
+
   /**
    * 备注
    */
@@ -381,6 +386,11 @@ export interface StglClubForm {
    */
   status?: string;
 
+  /**
+   * 是否开启报名
+   */
+  sighOpen?: string;
+
   /**
    * 备注
    */

web/src/api/stgl/member/types.ts

@@ -67,9 +67,9 @@ export interface StglMemberVO {
   email: string;
 
   /**
-   * 角色类型
+   * 成员角色
    */
-  roleType: number;
+  roleType: string;
 
   /**
    * 角色名称
@@ -164,9 +164,9 @@ export interface StglMemberForm {
   email?: string;
 
   /**
-   * 角色类型
+   * 成员角色
    */
-  roleType?: number;
+  roleType?: string;
 
   /**
    * 角色名称
@@ -216,9 +216,9 @@ export interface StglMemberQuery extends PageQuery {
   studentName?: string;
 
   /**
-   * 角色类型
+   * 成员角色
    */
-  roleType?: number;
+  roleType?: string;
 
   /**
    * 状态

web/src/api/stgl/my/index.ts

@@ -1,6 +1,16 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { MyClubVO, MyVolunteerTeamVO, MyActivityVO, MyRegistrationVO, ActivityRatingForm, MyRegistrationQuery, MyClubQuery, MyVolunteerQuery, MyActivityQuery } from './types';
+import {
+  MyClubVO,
+  MyVolunteerTeamVO,
+  MyActivityVO,
+  MyRegistrationVO,
+  ActivityRatingForm,
+  MyRegistrationQuery,
+  MyClubQuery,
+  MyVolunteerQuery,
+  MyActivityQuery
+} from './types';
 
 /**
  * 查询我参与的社团列表
@@ -18,7 +28,7 @@ export function getMyClubs(query?: MyClubQuery): AxiosPromise<MyClubVO[]> {
  */
 export function getMyVolunteerTeams(query?: MyVolunteerQuery): AxiosPromise<MyVolunteerTeamVO[]> {
   return request({
-    url: '/stgl/my/volunteerTeams', 
+    url: '/stgl/my/volunteerTeams',
     method: 'get',
     params: query
   });
@@ -65,4 +75,4 @@ export function canRateActivity(activityId: string | number): AxiosPromise<boole
     url: `/stgl/my/activities/${activityId}/canRate`,
     method: 'get'
   });
-} 
+}

web/src/api/stgl/my/types.ts

@@ -211,4 +211,4 @@ export interface MyRegistrationQuery {
   registrationType?: string;
   /** 审核状态 */
   approvalStatus?: string;
-} 
+}

web/src/api/stgl/register/types.ts

@@ -49,6 +49,11 @@ export interface StglClubRegisterVO {
    */
   canRegister: boolean;
 
+  /**
+   * 报名开启状态
+   */
+  sighOpen?: string;
+
   /**
    * 招新周期
    */
@@ -242,6 +247,11 @@ export interface StglClubRegisterQuery extends PageQuery {
    */
   canRegister?: boolean;
 
+  /**
+   * 报名开启状态
+   */
+  sighOpen?: string;
+
   /**
    * 日期范围参数
    */

web/src/api/stgl/volunteermember/types.ts

@@ -4,6 +4,16 @@ export interface VolunteerMemberVO {
    */
   id: string | number;
 
+  /**
+   * 用户ID
+   */
+  userId?: string | number;
+
+  /**
+   * 成员类型（1-社团成员,2-志愿者成员）
+   */
+  memberType?: number;
+
   /**
    * 学号
    */
@@ -65,7 +75,7 @@ export interface VolunteerMemberVO {
   joinTime: string;
 
   /**
-   * 状态（0正常 1停用）
+   * 状态（0待审核 1审核中 2已加入 3已驳回 4已退出）
    */
   status: string;
 
@@ -101,6 +111,16 @@ export interface VolunteerMemberForm {
    */
   id?: string | number;
 
+  /**
+   * 用户ID
+   */
+  userId?: string | number;
+
+  /**
+   * 成员类型（1-社团成员,2-志愿者成员）
+   */
+  memberType?: number;
+
   /**
    * 学号
    */
@@ -157,7 +177,7 @@ export interface VolunteerMemberForm {
   joinTime?: string;
 
   /**
-   * 状态（0正常 1停用）
+   * 状态（0待审核 1审核中 2已加入 3已驳回 4已退出）
    */
   status?: string;
 
@@ -209,7 +229,7 @@ export interface VolunteerMemberQuery {
   relationId?: string | number;
 
   /**
-   * 状态（0正常 1停用）
+   * 状态（0待审核 1审核中 2已加入 3已驳回 4已退出）
    */
   status?: string;
 

web/src/api/stgl/volunteerteam/index.js

@@ -212,3 +212,22 @@ export function listVolunteerTeamForRegistration(query) {
     params: query
   });
 }
+
+/**
+ * 修改志愿者团队报名开启状态
+ * @param id 团队ID
+ * @param sighOpen 报名开启状态(Y/N)
+ */
+export function changeSighOpenStatus(id, sighOpen) {
+  return request({
+    url: '/stgl/volunteerTeam/changeSighOpenStatus',
+    method: 'put',
+    params: {
+      id,
+      sighOpen
+    },
+    headers: {
+      isEncrypt: 'true'
+    }
+  });
+}

web/src/api/system/menu/index.ts

@@ -11,6 +11,17 @@ export const listMenu = (query?: MenuQuery): AxiosPromise<MenuVO[]> => {
   });
 };
 
+// 获取首页菜单数据（无权限限制，用于首页展示）
+export const getHomeMenus = (): AxiosPromise<MenuVO[]> => {
+  return request({
+    url: '/system/menu/list',
+    method: 'get',
+    params: {
+      status: '0' // 只获取正常状态的菜单
+    }
+  });
+};
+
 // 查询菜单详细
 export const getMenu = (menuId: string | number): AxiosPromise<MenuVO> => {
   return request({

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

@@ -52,10 +52,34 @@ export function getStudentPersonalInfo(userId?: number): AxiosPromise<any> {
   });
 }
 
+/**
+ * 获取宿舍房间信息
+ * @param roomId 房间ID
+ */
+export function getDormRoomInfo(roomId: number): AxiosPromise<R<any>> {
+  return request({
+    url: `/xgss/dormRoom/${roomId}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 获取宿舍床位信息
+ * @param bedId 床位ID
+ */
+export function getDormBedInfo(bedId: number): AxiosPromise<R<any>> {
+  return request({
+    url: `/dormbed/dormBed/${bedId}`,
+    method: 'get'
+  });
+}
+
 export default {
   XgDeptTreeSelect,
   deptTreeSelect,
   listStudentRoster,
   exportStudentRoster,
-  getStudentPersonalInfo
+  getStudentPersonalInfo,
+  getDormRoomInfo,
+  getDormBedInfo
 };