评语

doc/sql/mysql/tianze-pro-update.sql

@@ -368,6 +368,7 @@ ALTER TABLE teacher_open_course_question_log ADD COLUMN is_error_favorite int(2)
 ALTER TABLE teacher_open_course_question_log ADD COLUMN teacher_open_course_question_log_create_time datetime COMMENT '创建时间';
 ALTER TABLE teacher_open_course_question_log ADD COLUMN teacher_open_course_question_log_update_time datetime COMMENT '修改时间';
 ALTER TABLE teacher_open_course_question_log ADD COLUMN teacher_open_course_question_log_finish_time int(10) default 1 COMMENT '总用时（分钟）';
+ALTER TABLE teacher_open_course_question_log ADD COLUMN teacher_open_course_question_log_reply varchar(300) COMMENT '评语';
 
 -- 通用的题目配置
 drop table if exists general_question_setting;
@@ -444,7 +445,8 @@ CREATE TABLE `general_question_log` (
     `general_question_log_create_time` datetime COMMENT '创建时间',
     `general_question_log_update_time` datetime COMMENT '修改时间',
     `general_question_log_finish_time` int(10) default 1 COMMENT '总用时（分钟）',
+    `general_question_log_reply` varchar(300) default 1 COMMENT '评语',
     `org_id` bigint(20) DEFAULT NULL COMMENT '组织ID',
     `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
     PRIMARY KEY (`general_question_log_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='题库-通用做题日志';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='题库-通用做题日志';

web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java

@@ -123,6 +123,10 @@ public class GeneralQuestionLog extends BaseEntity{
     //用时（分钟）
 
     private Long generalQuestionLogFinishTime ;
+
+    // 评语
+
+    private String generalQuestionLogReply ;
 	
     //组织ID
 

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java

@@ -126,6 +126,10 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{
 
     private Long teacherOpenCourseQuestionLogFinishTime ;
 
+    //评语
+
+    private String teacherOpenCourseQuestionLogReply ;
+
     //组织ID
 
     private Long orgId ;

web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Nullable;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -447,16 +448,20 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
      * 教师端-手动批改一些题目的分数
      *
      * @param generalQuestionLogIds       指定更新分数的题目日志IDs
-     * @param score
+     * @param score                       分数
+     * @param reply                       评语
      */
-    public void manualModifyQuestionScores(@NotNull(message = "题目做题日志ID不能为空！") final String generalQuestionLogIds, @NotEmpty final BigDecimal score) {
+    public void manualModifyQuestionScores(@NotNull(message = "题目做题日志ID不能为空！") final String generalQuestionLogIds, @NotEmpty final BigDecimal score, @Nullable final String reply) {
         GeneralQuestionLogQuery generalQuestionLogQuery = new GeneralQuestionLogQuery();
         generalQuestionLogQuery.setGeneralQuestionLogIdPlural(generalQuestionLogIds);
         generalQuestionLogQuery.setGeneralQuestionLogStatus(1);
         List<GeneralQuestionLog> updateList = generalQuestionLogDao.getValuesByQueryNotWithPermission(generalQuestionLogQuery);
 
         // 批量更新分数
-        updateList.forEach(questionLog -> questionLog.setQuestionScore(score));
+        updateList.forEach(questionLog -> {
+            questionLog.setQuestionScore(score);
+            questionLog.setGeneralQuestionLogReply(reply);
+        });
         updateBatchTemplate(updateList);
 
     }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Nullable;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -251,16 +252,20 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
      * 教师端-手动批改一些题目的分数
      *
      * @param teacherOpenCourseQuestionLogIds       指定更新分数的题目日志IDs
-     * @param score
+     * @param score                                 分数
+     * @param reply                                 评语
      */
-    public void manualModifyQuestionScores(@NotNull(message = "题目做题日志ID不能为空！") final String teacherOpenCourseQuestionLogIds, @NotEmpty final BigDecimal score) {
+    public void manualModifyQuestionScores(@NotNull(message = "题目做题日志ID不能为空！") final String teacherOpenCourseQuestionLogIds, @NotEmpty final BigDecimal score, @Nullable String reply) {
         TeacherOpenCourseQuestionLogQuery teacherOpenCourseQuestionLogQuery = new TeacherOpenCourseQuestionLogQuery();
         teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionLogIdPlural(teacherOpenCourseQuestionLogIds);
         teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionLogStatus(1);
         List<TeacherOpenCourseQuestionLog> updateList = teacherOpenCourseQuestionLogDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionLogQuery);
 
         // 批量更新分数
-        updateList.forEach(questionLog -> questionLog.setQuestionScore(score));
+        updateList.forEach(questionLog -> {
+            questionLog.setQuestionScore(score);
+            questionLog.setTeacherOpenCourseQuestionLogReply(reply);
+        });
         updateBatchTemplate(updateList);
 
     }
@@ -309,6 +314,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         TeacherOpenCourseQuestionLogQuery query = new TeacherOpenCourseQuestionLogQuery();
         query.setTeacherOpenCourseQuestionLogUploadFile(absFilePath);
         query.setTeacherOpenCourseQuestionSettingId(questionSettingId);
+        query.setTeacherOpenCourseQuestionLogUpdateTime(new Date());
         query.setTeacherOpenCourseQuestionLogStatus(1);
         query.setOrgId(student.getOrgId());
         query.setUserId(student.getUserId());

web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java

@@ -130,16 +130,17 @@ public class GeneralQuestionLogController{
      * 教师端-手动批改一些题目的分数
      *
      * @param generalQuestionLogIds       指定更新分数的题目日志IDs
-     * @param score
+     * @param score                       分数
+     * @param reply                       评语
      */
     @PostMapping(API + "/manualModifyQuestionScores.do")
     @ResponseBody
     public JsonResult manualModifyQuestionScores(
-            String generalQuestionLogIds, BigDecimal score,
+            String generalQuestionLogIds, BigDecimal score, @RequestParam(required = false) String reply,
             @SCoreUser
             CoreUser coreUser) {
         Assert.notNull(coreUser, "请登录后再操作");
-        generalQuestionLogService.manualModifyQuestionScores(generalQuestionLogIds, score);
+        generalQuestionLogService.manualModifyQuestionScores(generalQuestionLogIds, score, reply);
         return JsonResult.success();
     }
 

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java

@@ -131,17 +131,18 @@ public class TeacherOpenCourseQuestionLogController {
     /**
      * 教师端-手动批改一些题目的分数
      *
-     * @param teacherOpenCourseQuestionLogIds       指定更新分数的题目日志IDs
-     * @param score
+     * @param generalQuestionLogIds       指定更新分数的题目日志IDs
+     * @param score                       分数
+     * @param reply                       评语
      */
     @PostMapping(API + "/manualModifyQuestionScores.do")
     @ResponseBody
     public JsonResult manualModifyQuestionScores(
-            String teacherOpenCourseQuestionLogIds, BigDecimal score,
+            String teacherOpenCourseQuestionLogIds, BigDecimal score, @RequestParam(required = false) String reply,
             @SCoreUser
             CoreUser coreUser) {
         Assert.notNull(coreUser, "请登录后再操作");
-        teacherOpenCourseQuestionLogService.manualModifyQuestionScores(teacherOpenCourseQuestionLogIds, score);
+        teacherOpenCourseQuestionLogService.manualModifyQuestionScores(teacherOpenCourseQuestionLogIds, score, reply);
         return JsonResult.success();
     }
 

web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionLogQuery.java

@@ -74,6 +74,8 @@ public class GeneralQuestionLogQuery extends PageParam {
     private Date generalQuestionLogUpdateTime ;
     @Query(name = "用时（分钟）", display = false)
     private Long generalQuestionLogFinishTime ;
+    @Query(name = "评语", display = false)
+    private String generalQuestionLogReply ;
     @Query(name = "组织ID", display = false)
     private Long orgId;
     @Query(name = "用户ID", display = false)
@@ -118,6 +120,7 @@ public class GeneralQuestionLogQuery extends PageParam {
         pojo.setIsErrorFavorite(this.getIsErrorFavorite());
         pojo.setGeneralQuestionLogUpdateTime(this.getGeneralQuestionLogUpdateTime());
         pojo.setGeneralQuestionLogFinishTime(this.getGeneralQuestionLogFinishTime());
+        pojo.setGeneralQuestionLogReply(this.getGeneralQuestionLogReply());
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
         return pojo;

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java

@@ -104,6 +104,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
 
     private Long teacherOpenCourseQuestionLogFinishTime ;
 
+    //评语
+
+    private String teacherOpenCourseQuestionLogReply ;
+
     private String teacherOpenCourseQuestionLogIdPlural;
     private String teacherOpenCourseQuestionSettingIdPlural;
     private String resourcesQuestionSnapshotIdPlural;
@@ -144,7 +148,7 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
         pojo.setIsTuck(this.getIsTuck());
         pojo.setTeacherOpenCourseQuestionLogUpdateTime(this.getTeacherOpenCourseQuestionLogUpdateTime());
         pojo.setTeacherOpenCourseQuestionLogFinishTime(this.getTeacherOpenCourseQuestionLogFinishTime());
-
+        pojo.setTeacherOpenCourseQuestionLogReply(this.getTeacherOpenCourseQuestionLogReply());
         return pojo;
     }