学生综合评价

src/main/java/com/template/controller/DriverStockController.java

@@ -55,7 +55,7 @@ public class DriverStockController implements DriverStockControllerAPI {
         Tj teacher = new Tj();
         teacher.setName("教师");
         teacher.setNum(num);
-        list = list.stream().filter(e -> !e.name.contains("老师")).collect(Collectors.toList());
+        list = list.stream().filter(e -> !e.name.contains("老师") && !e.name.contains("家长")).collect(Collectors.toList());
         list.add(teacher);
         return CommonResult.ok(list);
     }

src/main/java/com/template/controller/SmartEvaluateStudentController2.java

@@ -13,13 +13,11 @@ import com.template.model.pojo.SmartScore;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -46,7 +44,9 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
     @Autowired
     public SmartGradeService smartGradeService;
 
-    /** ==============================第二版============================ **/
+    /**
+     * ==============================第二版============================
+     **/
     @PassToken
     public CommonResult addSmartSubjectTemplate(JSONObject jsonObject) {
         SmartTemplateRuleList smartTemplateRuleList = null;
@@ -62,7 +62,7 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         queryWrapper1.eq("term", smartSubjectTemplate.getTerm());
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
         List<SmartSubjectTemplate> listc = smartSubjectTemplateService.list(queryWrapper1);
-        if (!listc.isEmpty()){
+        if (!listc.isEmpty()) {
             return CommonResult.fail("该评分项已存在");
         }
         List<SmartTemplateRule> ruleList = smartTemplateRuleList.getRuleList();
@@ -97,11 +97,11 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         queryWrapper1.eq("term_id", smartSubjectTemplate.getTerm());
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
         List<SmartSubjectTemplate> listc = smartSubjectTemplateService.list(queryWrapper1);
-        if (!listc.isEmpty() && !Objects.equals(listc.get(0).getId(), smartSubjectTemplate.getId())){
+        if (!listc.isEmpty() && !Objects.equals(listc.get(0).getId(), smartSubjectTemplate.getId())) {
             return CommonResult.fail("该评分项已存在");
         }
         SmartSubjectTemplate st = smartSubjectTemplateService.getSmartSubjectTemplateById(smartSubjectTemplate.getId());
-        if (st==null){
+        if (st == null) {
             return CommonResult.fail("未找到该评分项");
         }
         QueryWrapper<SmartEvaluateStudent> queryWrapper2 = new QueryWrapper<>();
@@ -111,23 +111,23 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         // queryWrapper2.eq("exam_type", smartSubjectTemplate.getExamType());
         queryWrapper2.isNotNull("score_level");
         List<SmartEvaluateStudent> evaluateData = smartEvaluateStudentService.getSmartEvaluateStudentByKey(queryWrapper2);
-        if (!evaluateData.isEmpty()){
+        if (!evaluateData.isEmpty()) {
             return CommonResult.fail("该评分项已评测，不可修改");
         }
         List<SmartTemplateRule> ruleList = smartTemplateRuleList.getRuleList();
-        List<String> levels = ruleList.stream().filter(e->e.getDeleted().equals(0)).map(SmartTemplateRule::getLevel).collect(Collectors.toList());
+        List<String> levels = ruleList.stream().filter(e -> e.getDeleted().equals(0)).map(SmartTemplateRule::getLevel).collect(Collectors.toList());
         Set<String> levelSet = new HashSet<>(levels);
         if (levels.size() != levelSet.size()) {
             return CommonResult.fail("存在重复等级");
         }
         for (int i = 0; i < ruleList.size(); i++) {
             SmartTemplateRule rule = ruleList.get(i);
-            if (rule.getId()==null){
+            if (rule.getId() == null) {
                 rule.setId((int) UUIDUtil.generateID());
             }
             rule.setTemplateId(smartSubjectTemplate.getId());
             SmartTemplateRule ruleListc = smartTemplateRuleService.getSmartTemplateRuleById(rule.getId());
-            if (ruleListc==null){
+            if (ruleListc == null) {
                 smartTemplateRuleService.insertSmartTemplateRule(rule);
             } else {
                 smartTemplateRuleService.updateSmartTemplateRule(rule);
@@ -140,11 +140,11 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
 
     @PassToken
     public CommonResult delSmartSubjectTemplate(Integer id) {
-        if (id==null){
+        if (id == null) {
             return CommonResult.fail("请传入ID");
         }
         SmartSubjectTemplate smartSubjectTemplate = smartSubjectTemplateService.getSmartSubjectTemplateById(id);
-        if (smartSubjectTemplate==null){
+        if (smartSubjectTemplate == null) {
             return CommonResult.fail("该评分项不存在");
         }
         QueryWrapper<SmartEvaluateStudent> queryWrapper1 = new QueryWrapper<>();
@@ -154,14 +154,14 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
         queryWrapper1.isNotNull("score_level");
         List<SmartEvaluateStudent> evaluateData = smartEvaluateStudentService.getSmartEvaluateStudentByKey(queryWrapper1);
-        if (!evaluateData.isEmpty()){
+        if (!evaluateData.isEmpty()) {
             return CommonResult.fail("该评分项已评测，不可删除");
         }
         QueryWrapper<SmartTemplateRule> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("deleted", 0);
         queryWrapper2.eq("template_id", smartSubjectTemplate.getId());
         List<SmartTemplateRule> listc = smartTemplateRuleService.getSmartTemplateRuleByKey(queryWrapper2);
-        if (!listc.isEmpty()){
+        if (!listc.isEmpty()) {
             SmartTemplateRule sr = new SmartTemplateRule();
             sr.setDeleted(1);
             smartTemplateRuleService.update(sr, queryWrapper2);
@@ -177,6 +177,24 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         queryWrapper1.eq("deleted", 0);
         queryWrapper1.orderByDesc("id");
         PageUtils<SmartSubjectTemplate> list = smartSubjectTemplateService.queryPageSmartSubjectTemplate(currentPage, pageCount, queryWrapper1);
+        List<SmartExamtype> examtypes = smartExamtypeService.list(null);
+        if (list.getList() != null && list.getList().size() > 0) {
+            for (SmartSubjectTemplate data : list.getList()) {
+                List<Integer> names = new ArrayList<>();
+                List<String> examTypes = Arrays.asList(data.getExamType().split(","));
+                if (examtypes != null && examtypes.size() > 0) {
+                    for (String examType : examTypes) {
+                        Optional<SmartExamtype> oExamtype = examtypes.stream().filter(e -> String.valueOf(e.getId()).equals(examType)).findFirst();
+                        if(oExamtype != null && oExamtype.isPresent()){
+                            names.add(oExamtype.get().getId());
+                        }
+                    }
+                }
+
+                data.setExamType(StringUtils.join(names));
+            }
+
+        }
         return CommonResult.ok(list);
     }
 
@@ -193,11 +211,11 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
 
     @PassToken
     public CommonResult evaluateScore(Integer id, String scoreComment) {
-        if (id==null) {
+        if (id == null) {
             return CommonResult.fail("请传入ID");
         }
         SmartEvaluateStudent evaluateStudent = smartEvaluateStudentService.getSmartEvaluateStudentById(id);
-        if (evaluateStudent==null){
+        if (evaluateStudent == null) {
             return CommonResult.fail("该条记录已删除");
         }
         QueryWrapper<SmartSubjectTemplate> queryWrapper1 = new QueryWrapper<>();
@@ -205,7 +223,7 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         queryWrapper1.eq("grade", evaluateStudent.getGradeName());
         queryWrapper1.eq("term", evaluateStudent.getTerm());
         List<SmartSubjectTemplate> templateList = smartSubjectTemplateService.getSmartSubjectTemplateByKey(queryWrapper1);
-        if (templateList.isEmpty()){
+        if (templateList.isEmpty()) {
             return CommonResult.fail("未查询到相关评价模板");
         }
         SmartSubjectTemplate template = templateList.get(0);
@@ -219,11 +237,11 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         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("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()+"不支持综评！");
+            if (smartExamtype.getIsExam() == 0) {
+                return CommonResult.fail(smartGrade.getName() + "-" + smartExamtype.getName() + "不支持综评！");
             }
             QueryWrapper<SmartScore> queryWrapper4 = new QueryWrapper<>();
             queryWrapper4.eq("deleted", 0);
@@ -232,20 +250,20 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
             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()+"考试成绩");
+            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();
+                totalScore += scoreList.get(j).getScore();
                 k++;
             }
         }
-        Double avgScore = totalScore/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()){
+        if (ruleList.isEmpty()) {
             return CommonResult.fail("未配置评分规则");
         }
         String scoreLevel = "";