“班主任考核更新8.22”

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

@@ -1,11 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { 
-  AssessmentApprovalQuery,
-  AssessmentApprovalVO,
-  AssessmentApprovalDetailVO,
-  AssessmentApprovalSubmitBO
-} from './types';
+import { AssessmentApprovalQuery, AssessmentApprovalVO, AssessmentApprovalDetailVO, AssessmentApprovalSubmitBO, EvaluationLevelStatsVO } from './types';
 
 /**
  * 查询班主任考核审核列表
@@ -27,7 +22,11 @@ export const listAssessmentApproval = (query?: AssessmentApprovalQuery): AxiosPr
  * @param evaluatedUserId 被评价用户ID
  * @returns {*}
  */
-export const getAssessmentApprovalDetail = (planId: string | number, classId: string | number, evaluatedUserId: string | number): AxiosPromise<AssessmentApprovalDetailVO> => {
+export const getAssessmentApprovalDetail = (
+  planId: string | number,
+  classId: string | number,
+  evaluatedUserId: string | number
+): AxiosPromise<AssessmentApprovalDetailVO> => {
   return request({
     url: '/bzrkh/assessmentApproval/detail',
     method: 'get',
@@ -75,7 +74,7 @@ export const batchRejectAssessment = (ids: (string | number)[], rejectReason: st
   return request({
     url: '/bzrkh/assessmentApproval/batchReject',
     method: 'post',
-    data: { 
+    data: {
       ids,
       rejectReason
     }
@@ -105,4 +104,17 @@ export const exportAssessmentApproval = (query?: AssessmentApprovalQuery): Axios
     data: query,
     responseType: 'blob'
   });
-}; 
+};
+
+/**
+ * 获取评价等级统计数据
+ * @param planId 计划ID
+ * @returns {*}
+ */
+export const getEvaluationLevelStats = (planId: string | number): AxiosPromise<EvaluationLevelStatsVO> => {
+  return request({
+    url: '/bzrkh/assessmentApproval/evaluationStats',
+    method: 'get',
+    params: { planId }
+  });
+};

web/src/api/bzrkh/assessmentApproval/types.ts

@@ -51,7 +51,7 @@ export interface AssessmentApprovalDetailVO {
   id?: string | number;
   planId?: string | number;
   classId?: string | number;
-  
+
   /**
    * 班级详细信息
    */
@@ -64,7 +64,7 @@ export interface AssessmentApprovalDetailVO {
     totalStudentCount?: number;
     boardingStudentCount?: number;
   };
-  
+
   /**
    * 系数信息
    */
@@ -74,42 +74,42 @@ export interface AssessmentApprovalDetailVO {
     studentCountCoefficient?: number;
     boardingCoefficient?: number;
   };
-  
+
   /**
    * 班主任常规工作指标列表 - 包含自评和上级评分
    */
   routineWorkIndicators?: AssessmentApprovalIndicatorVO[];
-  
+
   /**
    * 班级扣分指标 - 班级管理实效
    */
   classDeductionIndicator?: AssessmentApprovalIndicatorVO;
-  
+
   /**
    * 特色工作指标列表
    */
   specialWorkIndicators?: AssessmentApprovalSpecialWorkVO[];
-  
+
   /**
    * 自我总体评价
    */
   selfOverallComment?: string;
-  
+
   /**
    * 上级总体评价
    */
   superiorOverallComment?: string;
-  
+
   /**
    * 月考核得分
    */
   monthlyScore?: number;
-  
+
   /**
    * 审核状态
    */
   auditStatus?: string;
-  
+
   /**
    * 提交时间
    */
@@ -125,17 +125,17 @@ export interface AssessmentApprovalIndicatorVO {
   indicatorName?: string;
   indicatorCode?: string;
   description?: string;
-  score?: number;  // 指标分值
+  score?: number; // 指标分值
   maxScore?: number;
-  
+
   // 自评相关
   selfScore?: number;
   selfComment?: string;
-  
+
   // 上级评相关
   superiorScore?: number;
   superiorComment?: string;
-  
+
   // 审核状态
   auditStatus?: string;
 }
@@ -147,15 +147,16 @@ export interface AssessmentApprovalSpecialWorkVO {
   id?: string | number;
   indicatorCode?: string;
   indicatorName?: string;
-  
+
   // 自评相关
-  score?: number;  // 自评分数
+  score?: number; // 自评分数 (兼容原有字段)
+  selfScore?: number; // 自评分数 (标准字段名)
   selfComment?: string;
-  
+
   // 上级评相关
   superiorScore?: number;
   superiorComment?: string;
-  
+
   // 审核状态
   auditStatus?: string;
 }
@@ -167,32 +168,32 @@ export interface AssessmentApprovalSubmitBO {
   planId?: string | number;
   classId?: string | number;
   evaluatedUserId?: string | number;
-  
+
   /**
    * 班主任常规工作审核数据
    */
   routineWorkApproval?: AssessmentApprovalIndicatorSubmitVO[];
-  
+
   /**
    * 班级管理实效审核数据
    */
   classDeductionApproval?: AssessmentApprovalIndicatorSubmitVO;
-  
+
   /**
    * 特色工作审核数据
    */
   specialWorkApproval?: AssessmentApprovalSpecialWorkSubmitVO[];
-  
+
   /**
    * 上级总体评价
    */
   superiorOverallComment?: string;
-  
+
   /**
    * 审核状态 0=待审核 1=审核通过 2=审核不通过
    */
   auditStatus?: string;
-  
+
   /**
    * 审核意见
    */
@@ -217,4 +218,26 @@ export interface AssessmentApprovalSpecialWorkSubmitVO {
   indicatorCode?: string;
   superiorScore?: number;
   superiorComment?: string;
-} 
+}
+
+/**
+ * 评价等级统计数据
+ */
+export interface EvaluationLevelStatsVO {
+  totalTeachers: number;           // 总班主任数量
+  scoreRankings: ScoreRankingVO[]; // 分数排名列表
+  evaluationLevelRules: {          // 评价等级规则
+    aLevelMaxPercentage: number;   // A等最大占比（如20%）
+    passScore: number;             // 及格分数（如60分）
+  };
+}
+
+/**
+ * 分数排名VO
+ */
+export interface ScoreRankingVO {
+  score: number;                   // 考核得分
+  ranking: number;                 // 排名（从1开始）
+  percentage: number;              // 百分比排名（前X%）
+  evaluatedUserId?: string | number; // 被评价用户ID（可选，用于标识当前用户）
+}

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

@@ -4,7 +4,7 @@ import { AssessmentIndicatorVO, AssessmentIndicatorQuery, AssessmentIndicatorFor
 /**
  * 查询班主任考核指标体系列表
  * @param query 查询条件
- * @returns 
+ * @returns
  */
 export function listBmzrAssessmentIndicator(query?: AssessmentIndicatorQuery) {
   return request({
@@ -17,7 +17,7 @@ export function listBmzrAssessmentIndicator(query?: AssessmentIndicatorQuery) {
 /**
  * 查询班主任考核指标体系详细
  * @param id 主键
- * @returns 
+ * @returns
  */
 export function getBmzrAssessmentIndicator(id: string | number) {
   return request({
@@ -29,7 +29,7 @@ export function getBmzrAssessmentIndicator(id: string | number) {
 /**
  * 新增班主任考核指标体系
  * @param data 表单数据
- * @returns 
+ * @returns
  */
 export function addBmzrAssessmentIndicator(data: AssessmentIndicatorForm) {
   return request({
@@ -42,7 +42,7 @@ export function addBmzrAssessmentIndicator(data: AssessmentIndicatorForm) {
 /**
  * 修改班主任考核指标体系
  * @param data 表单数据
- * @returns 
+ * @returns
  */
 export function updateBmzrAssessmentIndicator(data: AssessmentIndicatorForm) {
   return request({
@@ -55,7 +55,7 @@ export function updateBmzrAssessmentIndicator(data: AssessmentIndicatorForm) {
 /**
  * 删除班主任考核指标体系
  * @param ids 主键串
- * @returns 
+ * @returns
  */
 export function delBmzrAssessmentIndicator(ids: string | number | Array<string | number>) {
   return request({
@@ -66,7 +66,7 @@ export function delBmzrAssessmentIndicator(ids: string | number | Array<string |
 
 /**
  * 获取指标类型选项
- * @returns 
+ * @returns
  */
 export function getIndicatorTypeOptions() {
   return request({
@@ -77,11 +77,11 @@ export function getIndicatorTypeOptions() {
 
 /**
  * 获取父级指标选项
- * @returns 
+ * @returns
  */
 export function getParentIndicatorOptions() {
   return request({
     url: '/bzrkh/assessmentIndicator/treeselect',
     method: 'get'
   });
-} 
+}

web/src/api/bzrkh/assessmentIndicator/types.ts

@@ -234,4 +234,4 @@ export interface AssessmentIndicatorTypeOption {
    * 状态（0正常 1停用）
    */
   status?: string;
-} 
+}

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

@@ -72,4 +72,4 @@ export const delAssessmentIndicatorType = (id: string | number | Array<string |
     url: '/bzrkh/assessmentIndicatorType/' + id,
     method: 'delete'
   });
-}; 
+};

web/src/api/bzrkh/assessmentIndicatorType/types.ts

@@ -107,4 +107,4 @@ export interface AssessmentIndicatorTypeQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
-} 
+}

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

@@ -97,4 +97,4 @@ export const changeAssessmentPlanStatus = (id: string | number, status: string)
       planStatus: status
     }
   });
-}; 
+};

web/src/api/bzrkh/assessmentPlan/types.ts

@@ -237,4 +237,4 @@ export interface AssessmentSchemeOption {
    * 状态
    */
   status?: string;
-} 
+}

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

@@ -71,4 +71,4 @@ export const exportBmzrAssessmentScheme = (query?: BmzrAssessmentSchemeQuery): A
     method: 'post',
     data: query
   });
-}; 
+};

web/src/api/bzrkh/assessmentScheme/types.ts

@@ -182,4 +182,4 @@ export interface BmzrAssessmentSchemeQuery extends PageQuery {
    * 参数
    */
   params?: any;
-} 
+}

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

@@ -4,7 +4,7 @@ import { BmzrAssessmentSchemeIndicatorVO, BmzrAssessmentSchemeIndicatorQuery, Bm
 /**
  * 查询班主任考核方案指标关联列表
  * @param query 查询条件
- * @returns 
+ * @returns
  */
 export function listBmzrAssessmentSchemeIndicator(query?: BmzrAssessmentSchemeIndicatorQuery) {
   return request({
@@ -17,7 +17,7 @@ export function listBmzrAssessmentSchemeIndicator(query?: BmzrAssessmentSchemeIn
 /**
  * 根据方案ID查询指标关联列表
  * @param schemeId 方案ID
- * @returns 
+ * @returns
  */
 export function listBySchemeId(schemeId: string | number) {
   return request({
@@ -29,7 +29,7 @@ export function listBySchemeId(schemeId: string | number) {
 /**
  * 查询班主任考核方案指标关联详细
  * @param id 主键
- * @returns 
+ * @returns
  */
 export function getBmzrAssessmentSchemeIndicator(id: string | number) {
   return request({
@@ -41,7 +41,7 @@ export function getBmzrAssessmentSchemeIndicator(id: string | number) {
 /**
  * 新增班主任考核方案指标关联
  * @param data 表单数据
- * @returns 
+ * @returns
  */
 export function addBmzrAssessmentSchemeIndicator(data: BmzrAssessmentSchemeIndicatorForm) {
   return request({
@@ -54,7 +54,7 @@ export function addBmzrAssessmentSchemeIndicator(data: BmzrAssessmentSchemeIndic
 /**
  * 修改班主任考核方案指标关联
  * @param data 表单数据
- * @returns 
+ * @returns
  */
 export function updateBmzrAssessmentSchemeIndicator(data: BmzrAssessmentSchemeIndicatorForm) {
   return request({
@@ -67,7 +67,7 @@ export function updateBmzrAssessmentSchemeIndicator(data: BmzrAssessmentSchemeIn
 /**
  * 删除班主任考核方案指标关联
  * @param ids 主键串
- * @returns 
+ * @returns
  */
 export function delBmzrAssessmentSchemeIndicator(ids: string | number | Array<string | number>) {
   return request({
@@ -80,7 +80,7 @@ export function delBmzrAssessmentSchemeIndicator(ids: string | number | Array<st
  * 批量保存方案指标关联
  * @param schemeId 方案ID
  * @param indicatorList 指标列表
- * @returns 
+ * @returns
  */
 export function batchSaveSchemeIndicators(schemeId: string | number, indicatorList: BmzrAssessmentSchemeIndicatorForm[]) {
   return request({
@@ -88,4 +88,4 @@ export function batchSaveSchemeIndicators(schemeId: string | number, indicatorLi
     method: 'post',
     data: indicatorList
   });
-} 
+}

web/src/api/bzrkh/assessmentSchemeIndicator/types.ts

@@ -147,4 +147,4 @@ export interface BmzrAssessmentSchemeIndicatorQuery extends PageQuery {
    * 参数
    */
   params?: any;
-} 
+}

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

@@ -1,9 +1,9 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { 
-  TeacherClassVO, 
-  TeacherAssessmentPlanVO, 
-  TeacherAssessmentPlanQuery, 
+import {
+  TeacherClassVO,
+  TeacherAssessmentPlanVO,
+  TeacherAssessmentPlanQuery,
   TeacherClassQuery,
   AssessmentDetailVO,
   AssessmentSubmitVO
@@ -95,6 +95,18 @@ export const submitAssessmentScore = (data: AssessmentSubmitVO): AxiosPromise<vo
   });
 };
 
+/**
+ * 查询班级学生违纪记录和奖励记录
+ * @param classId 班级ID
+ */
+export const getClassStudentRecords = (classId: string | number): AxiosPromise<any> => {
+  return request({
+    url: '/bzrkh/teacherAssessment/classStudentRecords',
+    method: 'get',
+    params: { classId }
+  });
+};
+
 /**
  * 撤销考核提交
  * @param planId 计划ID
@@ -109,4 +121,4 @@ export const withdrawAssessment = (planId: string | number, classId: string | nu
       classId
     }
   });
-}; 
+};

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

@@ -231,32 +231,32 @@ export interface ClassDetailVO {
    * 班级ID
    */
   id?: string | number;
-  
+
   /**
    * 学院名称
    */
   collegeName?: string;
-  
+
   /**
    * 专业名称
    */
   majorName?: string;
-  
+
   /**
    * 班级名称
    */
   className?: string;
-  
+
   /**
    * 班级层次：1-中级工 2-高级工 3-预备技师 4-技师 5-中高职一体
    */
   classType?: string;
-  
+
   /**
    * 班级总人数
    */
   totalStudentCount?: number;
-  
+
   /**
    * 住校生人数
    */
@@ -271,17 +271,17 @@ export interface CoefficientVO {
    * 人数系数（K2）
    */
   studentCountCoefficient?: number;
-  
+
   /**
    * 住校生系数（K3）
    */
   boardingCoefficient?: number;
-  
+
   /**
    * 层次系数（K1）
    */
   levelCoefficient?: number;
-  
+
   /**
    * 总系数（K = K1 * (K2 + K3)）
    */
@@ -296,37 +296,37 @@ export interface AssessmentIndicatorVO {
    * 指标ID
    */
   id?: string | number;
-  
+
   /**
    * 指标名称
    */
   indicatorName?: string;
-  
+
   /**
    * 指标编码
    */
   indicatorCode?: string;
-  
+
   /**
    * 指标描述
    */
   description?: string;
-  
+
   /**
    * 指标分值
    */
   score?: number;
-  
+
   /**
    * 自评分数
    */
   selfScore?: number;
-  
+
   /**
    * 自评意见
    */
   selfComment?: string;
-  
+
   /**
    * 排序
    */
@@ -341,17 +341,17 @@ export interface SpecialWorkIndicatorVO {
    * 指标编码
    */
   indicatorCode?: string;
-  
+
   /**
    * 指标名称
    */
   indicatorName?: string;
-  
+
   /**
    * 分值
    */
   score?: number;
-  
+
   /**
    * 自评意见
    */
@@ -366,32 +366,32 @@ export interface AssessmentSubmitVO {
    * 考核计划ID
    */
   planId?: string | number;
-  
+
   /**
    * 班级ID
    */
   classId?: string | number;
-  
+
   /**
    * 班主任常规工作指标评分
    */
   routineWorkScores?: AssessmentIndicatorVO[];
-  
+
   /**
    * 班级扣分
    */
   classDeduction?: number;
-  
+
   /**
    * 班级扣分意见
    */
   classDeductionComment?: string;
-  
+
   /**
    * 特色工作指标评分
    */
   specialWorkScores?: SpecialWorkIndicatorVO[];
-  
+
   /**
    * 总体评价
    */
@@ -406,34 +406,179 @@ export interface AssessmentDetailVO {
    * 班级详细信息
    */
   classDetail?: ClassDetailVO;
-  
+
   /**
    * 系数信息
    */
   coefficient?: CoefficientVO;
-  
+
   /**
    * 班主任常规工作指标列表
    */
   routineWorkIndicators?: AssessmentIndicatorVO[];
-  
+
   /**
    * 班级扣分指标
    */
   classDeductionIndicator?: AssessmentIndicatorVO;
-  
+
   /**
    * 特色工作指标列表
    */
   specialWorkIndicators?: SpecialWorkIndicatorVO[];
-  
+
   /**
    * 月考核得分
    */
   monthlyScore?: number;
-  
+
   /**
    * 总体评价
    */
   overallComment?: string;
-} 
+}
+
+/**
+ * 班级学生违纪奖励记录
+ */
+export interface ClassStudentRecordsVO {
+  /**
+   * 班级名称
+   */
+  className?: string;
+
+  /**
+   * 违纪记录数量
+   */
+  disciplineCount?: number;
+
+  /**
+   * 奖励记录数量
+   */
+  rewardCount?: number;
+
+  /**
+   * 违纪记录列表
+   */
+  disciplineRecords?: StudentDisciplineRecordVO[];
+
+  /**
+   * 奖励记录列表
+   */
+  rewardRecords?: StudentRewardRecordVO[];
+}
+
+/**
+ * 学生违纪记录
+ */
+export interface StudentDisciplineRecordVO {
+  /**
+   * 记录ID
+   */
+  id?: string | number;
+
+  /**
+   * 学生ID
+   */
+  studentId?: string | number;
+
+  /**
+   * 学号
+   */
+  studentNo?: string;
+
+  /**
+   * 学生姓名
+   */
+  studentName?: string;
+
+  /**
+   * 违纪类型ID
+   */
+  disciplineTypeId?: string | number;
+
+  /**
+   * 违纪类型名称
+   */
+  disciplineTypeName?: string;
+
+  /**
+   * 违纪日期
+   */
+  disciplineDate?: string;
+
+  /**
+   * 违纪原因
+   */
+  disciplineReason?: string;
+
+  /**
+   * 处分内容
+   */
+  disciplineContent?: string;
+
+  /**
+   * 扣分分值
+   */
+  scoreDeduction?: number;
+
+  /**
+   * 状态（1=生效 0=已撤销）
+   */
+  status?: string;
+}
+
+/**
+ * 学生奖励记录
+ */
+export interface StudentRewardRecordVO {
+  /**
+   * 记录ID
+   */
+  id?: string | number;
+
+  /**
+   * 学生ID
+   */
+  studentId?: string | number;
+
+  /**
+   * 学号
+   */
+  studentNo?: string;
+
+  /**
+   * 学生姓名
+   */
+  studentName?: string;
+
+  /**
+   * 奖励类型ID
+   */
+  rewardTypeId?: string | number;
+
+  /**
+   * 奖励类型名称
+   */
+  rewardTypeName?: string;
+
+  /**
+   * 奖励日期
+   */
+  rewardDate?: string;
+
+  /**
+   * 奖励内容
+   */
+  rewardContent?: string;
+
+  /**
+   * 加分分值
+   */
+  scoreAddition?: number;
+
+  /**
+   * 状态（1=生效 0=撤销）
+   */
+  status?: string;
+}