Merge remote-tracking branch 'origin/develop' into develop

src/main/java/cn/teammodel/model/dto/ai/comment/WisdomCommentsDto.java

@@ -22,8 +22,8 @@ public class WisdomCommentsDto {
     public int onLine;
     //阅卷评测
     public int marking;
-    //评价
-    public int average;
+    //平均分
+    //public int average;
     //评分等级
     public String level;
     //占比

src/main/java/cn/teammodel/service/impl/ChatMessageServiceImpl.java

@@ -352,11 +352,26 @@ public class ChatMessageServiceImpl implements ChatMessageService {
                         wisdomComments.getLessonMiddle(),
                         wisdomComments.getOnLine(),
                         wisdomComments.getMarking(),
-                        wisdomComments.getAverage(),
                         wisdomComments.getLevel(),
                         wisdomComments.getProportion(),
                         wisdomComments.getName()
                 ));
+                /*
+                //有平均分
+                builder.append(String.format(
+                        finalChatModel.getChat(),
+                        wisdomComments.getName(),
+                        wisdomComments.getYear(),
+                        wisdomComments.getSemester(),
+                        wisdomComments.getJoinAll(),
+                        wisdomComments.getLessonMiddle(),
+                        wisdomComments.getOnLine(),
+                        wisdomComments.getMarking(),
+                        wisdomComments.getAverage(),
+                        wisdomComments.getLevel(),
+                        wisdomComments.getProportion(),
+                        wisdomComments.getName()
+                ));*/
                 wisdomComments.getDims().forEach(item -> {
                     builder.append(String.format(finalChatModel.getCycleChats().get(0),
                             item.name,

src/main/resources/Json/ChatModel.json

@@ -4,7 +4,7 @@
       "type": "wisdom",
       "name": "智育 总体评语模版",
       "role": "请扮演[%s%s]老师角色\n",
-      "chat": "%s同学，在%s学年度，第%s学期中，共计参加了%s次评测，其中课中评测%s次、线上评测%s次、阅卷评测%s次，智育评价分为%s分，素养等级为%s，已超过班级%s%% 同学。\n %s同学总体表现：",
+      "chat": "%s同学，在%s学年度，第%s学期中，共计参加了%s次评测，其中课中评测%s次、线上评测%s次、阅卷评测%s次，素养等级为%s，已超过班级%s%% 同学。\n %s同学总体表现：",
       "cycleChats": ["在%s中：学习态度为：%s、学习成效：%s、合作能力：%s、评价能力：%s、评价能力：%s ;\n"],
       "end": "根据我提供的数据,对这 %s 次考试成绩表现做一个评价\n"
     },