夏文涛 2 vuotta sitten
vanhempi
commit
9758782978

+ 2 - 61
src/main/java/com/template/controller/SmartEvaluateStudentController2.java

@@ -225,69 +225,10 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         if (evaluateStudent == null) {
             return CommonResult.fail("该条记录已删除");
         }
-        QueryWrapper<SmartSubjectTemplate> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
-        queryWrapper1.eq("grade", evaluateStudent.getGradeName());
-        queryWrapper1.eq("term", evaluateStudent.getTerm());
-        List<SmartSubjectTemplate> templateList = smartSubjectTemplateService.getSmartSubjectTemplateByKey(queryWrapper1);
-        if (templateList.isEmpty()) {
-            return CommonResult.fail("未查询到相关评价模板");
-        }
-        SmartSubjectTemplate template = templateList.get(0);
-        String[] examType = template.getExamType().split(",");
-        QueryWrapper<SmartGrade> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("deleted", 0);
-        queryWrapper2.eq("name", template.getGrade());
-        SmartGrade smartGrade = smartGradeService.getOne(queryWrapper2);
-        Double totalScore = 0.00;
-        int k = 0;
-        for (int i = 0; i < examType.length; i++) {
-            QueryWrapper<SmartExamtype> queryWrapper3 = new QueryWrapper<>();
-            queryWrapper3.eq("deleted", 0);
-            queryWrapper3.eq("grade_id", smartGrade.getId());
-            queryWrapper3.eq("name", examType[i]);
-            SmartExamtype smartExamtype = smartExamtypeService.getOne(queryWrapper3);
-            if (smartExamtype.getIsExam() == 0) {
-                return CommonResult.fail(smartGrade.getName() + "-" + smartExamtype.getName() + "不支持综评!");
-            }
-            QueryWrapper<SmartScore> queryWrapper4 = new QueryWrapper<>();
-            queryWrapper4.eq("deleted", 0);
-            queryWrapper4.eq("semester", template.getTerm());
-            queryWrapper4.eq("grade", template.getGrade());
-            queryWrapper4.eq("exam_type", smartExamtype.getId());
-            queryWrapper4.eq("card_no", evaluateStudent.getCardNo());
-            List<SmartScore> scoreList = smartScoreService.list(queryWrapper4);
-            if (scoreList.isEmpty()) {
-                return CommonResult.fail("未查询到" + evaluateStudent.getName() + "-" + template.getTerm() + "-" + smartExamtype.getName() + "考试成绩");
-            }
-            for (int j = 0; j < scoreList.size(); j++) {
-                totalScore += scoreList.get(j).getScore();
-                k++;
-            }
-        }
-        Double avgScore = totalScore / k;
-        QueryWrapper<SmartTemplateRule> queryWrapper5 = new QueryWrapper<>();
-        queryWrapper5.eq("deleted", 0);
-        queryWrapper5.eq("template_id", template.getId());
-        List<SmartTemplateRule> ruleList = smartTemplateRuleService.getSmartTemplateRuleByKey(queryWrapper5);
-        if (ruleList.isEmpty()) {
-            return CommonResult.fail("未配置评分规则");
-        }
-        String scoreLevel = "";
-        for (int j = 0; j < ruleList.size(); j++) {
-            String[] range = ruleList.get(j).getScoreRange().split("-");
-            double min = Double.parseDouble(range[0]);
-            double max = Double.parseDouble(range[1]);
-            if (avgScore >= min && avgScore <= max) {
-                scoreLevel = ruleList.get(j).getLevel();
-                break;
-            }
-        }
-        evaluateStudent.setScoreNum(avgScore);
-        evaluateStudent.setScoreLevel(scoreLevel);
+
         evaluateStudent.setScoreComment(scoreComment);
         smartEvaluateStudentService.updateSmartEvaluateStudent(evaluateStudent);
-        return CommonResult.ok();
+        return CommonResult.ok("评价成功");
     }
 
     @PassToken