评分修改

src/main/java/com/peanut/modules/common/controller/ClassController.java

@@ -333,15 +333,13 @@ public class ClassController {
     //心得评分
     @RequestMapping("/editTaskScore")
     public R editTaskScore(@RequestBody Map<String,Object> params){
-        classEntityService.editTaskScore(params);
+        return classEntityService.editTaskScore(params);
-        return R.ok();
     }
 
     //打分
     @RequestMapping("/editScore")
     public R editScore(@RequestBody Map<String,Object> params){
-        classEntityService.editScore(params);
+        return classEntityService.editScore(params);
-        return R.ok();
     }
 
     //编辑作业

src/main/java/com/peanut/modules/common/service/ClassEntityService.java

@@ -77,9 +77,9 @@ public interface ClassEntityService extends IService<ClassEntity> {
 
     Page getReplyListByTaskIdStudent(Map<String ,Object> params);
 
-    void editTaskScore(Map<String,Object> params);
+    R editTaskScore(Map<String,Object> params);
 
-    void editScore(Map<String,Object> params);
+    R editScore(Map<String,Object> params);
 
     void editClassTaskAndQuesReply(ClassTaskAndQuesReply classTaskAndQuesReply);
 

src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java

@@ -962,16 +962,25 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     }
 
     @Override
-    public void editTaskScore(Map<String, Object> params) {
+    public R editTaskScore(Map<String, Object> params) {
         ClassTask classTask = classTaskDao.selectById(params.get("taskId").toString());
+        ClassEntity classEntity = this.baseMapper.selectById(classTask.getClassId());
+        if ("1".equals(classEntity.getState())||"3".equals(classEntity.getState())){
             classTask.setScoreSuccess(classTask.getScoreSuccess()+1);
             classTask.setScore(Double.parseDouble(params.get("score").toString()));
             classTaskDao.updateById(classTask);
+        }else {
+            return R.error("此班级状态不能评分");
+        }
+        return R.ok();
     }
 
     @Override
-    public void editScore(Map<String, Object> params) {
+    @Transactional
+    public R editScore(Map<String, Object> params) {
         ClassTaskAndQuesReply classTaskAndQuesReply = classTaskAndQuesReplyDao.selectById(params.get("replyId").toString());
+        ClassEntity classEntity = this.baseMapper.selectById(classTaskAndQuesReply.getClassId());
+        if ("1".equals(classEntity.getState())||"3".equals(classEntity.getState())){
             String score = params.get("score").toString();
             String scoreInfo = "";
             Map<String,Object> userIdAndScore = new HashMap<>();
@@ -1005,6 +1014,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             classTaskAndQuesReply.setScoreSuccess(classTaskAndQuesReply.getScoreSuccess()+1);
             classTaskAndQuesReply.setScore(socre2.doubleValue());
             classTaskAndQuesReplyDao.updateById(classTaskAndQuesReply);
+        }else {
+            return R.error("此班级状态不能评分");
+        }
+        return R.ok();
     }
 
     @Override