Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

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

@@ -206,7 +206,9 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             if (smartEvaluateSdetail.getId()==null){
                 smartEvaluateSdetail.setId((int) UUIDUtil.generateID());
             }
-            total+=smartEvaluateSdetail.getScoreNum();
+            if (smartEvaluateSdetail.getDeleted()==0){
+                total+=smartEvaluateSdetail.getScoreNum();
+            }
             smartEvaluateSdetail.setTerm(student.getTerm());
             smartEvaluateSdetail.setCardNo(student.getCardNo());
             QueryWrapper<SmartSubjectRule> queryWrapper1 = new QueryWrapper<>();

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

@@ -86,7 +86,9 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
                 childScoreManage.setScoreNum(childList.get(j).getScoreNum());
                 childScoreManage.setDeleted(childList.get(j).getDeleted());
                 smList.add(childScoreManage);
-                mainScoreNum+=childList.get(j).getScoreNum();
+                if (childList.get(j).getDeleted()==0){
+                    mainScoreNum+=childList.get(j).getScoreNum();
+                }
             }
             mainScoreManage.setScoreNum(mainScoreNum);
             smList.add(mainScoreManage);