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

web/src/api/bzrkh/teacherAssessment/index.ts

@@ -98,12 +98,13 @@ export const submitAssessmentScore = (data: AssessmentSubmitVO): AxiosPromise<vo
 /**
  * 查询班级学生违纪记录和奖励记录
  * @param classId 班级ID
+ * @param planId 考核计划ID
  */
-export const getClassStudentRecords = (classId: string | number): AxiosPromise<any> => {
+export const getClassStudentRecords = (classId: string | number, planId: string | number): AxiosPromise<any> => {
   return request({
     url: '/bzrkh/teacherAssessment/classStudentRecords',
     method: 'get',
-    params: { classId }
+    params: { classId, planId }
   });
 };
 

web/src/api/rs/training.ts

@@ -52,6 +52,7 @@ export interface ApplicationQuery {
   pageSize: number;
   courseId?: number | string;
   courseName?: string;
+  location?: string; // 培训地点
   userId?: number | string;
   userName?: string;
   department?: string;
@@ -175,6 +176,15 @@ export function listTrainingApplication(query: ApplicationQuery) {
   });
 }
 
+// 查询待审批的培训申请列表（供审批人使用）
+export function listPendingTrainingApplication(query: ApplicationQuery) {
+  return request({
+    url: '/rs/training/application/pending/list',
+    method: 'get',
+    params: query
+  });
+}
+
 // 获取培训申请详情
 export function getTrainingApplication(applicationId: string | number) {
   return request({
@@ -245,6 +255,15 @@ export function listTrainingRecord(query: RecordQuery) {
   });
 }
 
+// 获取我的培训记录列表
+export function listMyTrainingRecord(query: RecordQuery) {
+  return request({
+    url: '/rs/training/record/my',
+    method: 'get',
+    params: query
+  });
+}
+
 // 获取培训记录详情
 export function getTrainingRecord(recordId: string | number) {
   return request({