deleted不用填

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

@@ -67,7 +67,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             return CommonResult.fail("存在重复学科");
         }
         QueryWrapper<SmartEvaluateSdetail> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("term", allList.get(0).getTerm());
         List<SmartEvaluateSdetail> smartEvaluateTdetails = smartEvaluateSdetailService.getSmartEvaluateSdetailByKey(queryWrapper1);
         if (smartEvaluateTdetails.size() > 0) {
@@ -94,7 +93,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             term = smartSubjectManageService.getMaxTerm();
         }
         QueryWrapper<SmartSubjectManage> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("term", term);
         List<SmartSubjectManage> list = smartSubjectManageService.getSmartSubjectManageByKey(queryWrapper1);
         JSONObject jsonObject = new JSONObject();
@@ -159,7 +157,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             term = smartSubjectManageService.getMaxTerm();
         }
         QueryWrapper<SmartSubjectManage> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("term", term);
         queryWrapper1.eq("shows", 1);
         List<SmartSubjectManage> list = smartSubjectManageService.getSmartSubjectManageByKey(queryWrapper1);
@@ -167,7 +164,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
         List<JSONObject> lj = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             QueryWrapper<SmartSubjectRule> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("deleted", 0);
             queryWrapper2.eq("term", term);
             queryWrapper2.eq("subject_name", list.get(i).getName());
             List<SmartSubjectRule> list2 = smartSubjectRuleService.getSmartSubjectRuleByKey(queryWrapper2);
@@ -184,7 +180,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
     @PassToken
     public CommonResult queryEvaluateStudent(SmartEvaluateStudent smartEvaluateStudent, Integer currentPage, Integer pageCount) {
         QueryWrapper<SmartEvaluateStudent> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         if (smartEvaluateStudent.getName() != null && !smartEvaluateStudent.getName().trim().equals("")) {
             queryWrapper1.and(qw -> qw.like("name", smartEvaluateStudent.getName()).or().like("card_no", smartEvaluateStudent.getName()));
         }
@@ -257,7 +252,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             smartEvaluateSdetail.setTerm(student.getTerm());
             smartEvaluateSdetail.setCardNo(student.getCardNo());
             QueryWrapper<SmartSubjectRule> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("deleted", 0);
             queryWrapper1.eq("subject_name", smartEvaluateSdetail.getSubjectName());
             List<SmartSubjectRule> rule = smartSubjectRuleService.getSmartSubjectRuleByKey(queryWrapper1);
             String scoreLevel = "";
@@ -282,7 +276,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
         student.setScoreNum(total / scoreList.size());
         String scoreLevel = "";
         QueryWrapper<SmartSubjectRule> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("deleted", 0);
         queryWrapper2.eq("subject_name", "平均成绩");
         List<SmartSubjectRule> rule = smartSubjectRuleService.getSmartSubjectRuleByKey(queryWrapper2);
         for (int i = 0; i < rule.size(); i++) {
@@ -309,7 +302,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             return CommonResult.fail("未查询到相关信息");
         }
         QueryWrapper<SmartEvaluateSdetail> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("term", smartEvaluateStudent.getTerm());
         queryWrapper1.eq("card_no", smartEvaluateStudent.getCardNo());
         List<SmartEvaluateSdetail> list = smartEvaluateSdetailService.getSmartEvaluateSdetailByKey(queryWrapper1);
@@ -345,7 +337,6 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
         headerRow.createCell(6).setCellValue("教师寄语");
 
         QueryWrapper<SmartEvaluateStudent> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         if (smartEvaluateStudent.getName() != null && !smartEvaluateStudent.getName().trim().equals("")) {
             queryWrapper1.and(qw -> qw.like("name", smartEvaluateStudent.getName()).or().like("card_no", smartEvaluateStudent.getName()));
         }

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

@@ -140,8 +140,8 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         }
         SmartSubjectTemplate smartSubjectTemplate = smartTemplateRuleList.getSmartSubjectTemplate();
         QueryWrapper<SmartSubjectTemplate> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("grade_id", smartSubjectTemplate.getGrade());
-        queryWrapper1.eq("term_id", smartSubjectTemplate.getTerm());
+        queryWrapper1.eq("grade_id", smartSubjectTemplate.getGradeId());
+        queryWrapper1.eq("term_id", smartSubjectTemplate.getTermId());
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
         List<SmartSubjectTemplate> listc = smartSubjectTemplateService.list(queryWrapper1);
         if (!listc.isEmpty() && !Objects.equals(listc.get(0).getId(), smartSubjectTemplate.getId())) {