From d03ab5dc90725841b5a80725e8a7d04add0ad9e7 Mon Sep 17 00:00:00 2001
From: "hhb@hotmail.com" <hhb@hotmail.com>
Date: Tue, 21 Jan 2025 11:43:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=8B=8F=E6=A0=BC=E6=8B=89=E5=BA=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/teammodel/common/ErrorCode.java   | 73 ++++++++++---------
 .../service/impl/TeacherServiceImpl.java      | 11 +++
 .../cn/teammodel/model/vo/admin/SugVo.java    |  1 +
 3 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/main/java/cn/teammodel/common/ErrorCode.java b/src/main/java/cn/teammodel/common/ErrorCode.java
index a7c9eb8..f75bd0a 100644
--- a/src/main/java/cn/teammodel/common/ErrorCode.java
+++ b/src/main/java/cn/teammodel/common/ErrorCode.java
@@ -1,37 +1,38 @@
-package cn.teammodel.common;
-
-public enum ErrorCode {
-
-    SUCCESS(200, "ok"),
-    PARAMS_ERROR(40000, "请求参数错误"),
-    NOT_LOGIN_ERROR(40100, "未登录"),
-    NO_AUTH_ERROR(40101, "无权限"),
-    NOT_FOUND_ERROR(40400, "请求数据不存在"),
-    FORBIDDEN_ERROR(40300, "禁止访问"),
-    SYSTEM_ERROR(50000, "系统内部异常"),
-    OPERATION_ERROR(50001, "操作失败");
-
-    /**
-     * 状态码
-     */
-    private final int code;
-
-    /**
-     * 信息
-     */
-    private final String message;
-
-    ErrorCode(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
+package cn.teammodel.common;
+
+public enum ErrorCode {
+
+    SUCCESS(200, "ok"),
+    PARAMS_ERROR(40000, "请求参数错误"),
+    NOT_LOGIN_ERROR(40100, "未登录"),
+    NO_AUTH_ERROR(40101, "无权限"),
+    NOT_FOUND_ERROR(40400, "请求数据不存在"),
+    FORBIDDEN_ERROR(40300, "禁止访问"),
+    SYSTEM_ERROR(50000, "系统内部异常"),
+    OPERATION_ERROR(50001, "操作失败"),
+    DATA_FORMAT_ERROR(40001, "数据格式错误");
+
+    /**
+     * 状态码
+     */
+    private final int code;
+
+    /**
+     * 信息
+     */
+    private final String message;
+
+    ErrorCode(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java
index 651e2fd..c931247 100644
--- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java
+++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java
@@ -782,6 +782,7 @@ public class TeacherServiceImpl implements TeacherService {
             mapTeach.put("MaterialCount",scores[8]);
             mapTeach.put("TpcplanCount",scores[9]);
             mapTeach.put("Lessons",lessonRecords.size());
+            mapTeach.put("starLevel", sugVos.get(0).getStar_level());
             return mapTeach;
 
         }else if(teacherDto.getGradeName() != null) {
@@ -1010,6 +1011,16 @@ public class TeacherServiceImpl implements TeacherService {
                                 sugVoList.add(sugVo);
                             }
                         }
+                        if (dataMap.containsKey("member_list")) {
+                            List<Map<String, Object>> memberList = (List<Map<String, Object>>) dataMap.get("member_list");
+                            for (Map<String, Object> memberMap : memberList) {
+                               for (SugVo sugVo : sugVoList) {
+                                   if (memberMap.get("habook").equals(sugVo.getHabook())) {
+                                       sugVo.setStar_level(Integer.parseInt(memberMap.get("star_level").toString()));
+                                   }
+                               }
+                            }
+                        }
 
                     }
                 }
diff --git a/src/main/java/cn/teammodel/model/vo/admin/SugVo.java b/src/main/java/cn/teammodel/model/vo/admin/SugVo.java
index 64282f3..deb8b9a 100644
--- a/src/main/java/cn/teammodel/model/vo/admin/SugVo.java
+++ b/src/main/java/cn/teammodel/model/vo/admin/SugVo.java
@@ -23,4 +23,5 @@ public class SugVo {
     private Integer double_green_count;
     private Integer material_count;
     private Integer tpcplan_count;
+    private Integer star_level;
 }