夏文涛 před 2 roky
rodič
revize
4618dd8323

+ 0 - 8
src/main/java/com/template/controller/SmartEvaluateStudentController2.java

@@ -58,7 +58,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         }
         SmartSubjectTemplate smartSubjectTemplate = smartTemplateRuleList.getSmartSubjectTemplate();
         QueryWrapper<SmartSubjectTemplate> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("grade_id", smartSubjectTemplate.getGradeId());
         queryWrapper1.eq("term_id", smartSubjectTemplate.getTermId());
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
@@ -141,7 +140,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         }
         SmartSubjectTemplate smartSubjectTemplate = smartTemplateRuleList.getSmartSubjectTemplate();
         QueryWrapper<SmartSubjectTemplate> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("grade_id", smartSubjectTemplate.getGrade());
         queryWrapper1.eq("term_id", smartSubjectTemplate.getTerm());
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
@@ -154,7 +152,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
             return CommonResult.fail("未找到该评分项");
         }
         QueryWrapper<SmartEvaluateStudent> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("deleted", 0);
         queryWrapper2.eq("grade_id", smartSubjectTemplate.getGradeId());
         queryWrapper2.eq("term_id", smartSubjectTemplate.getTermId());
         // queryWrapper2.eq("exam_type", smartSubjectTemplate.getExamType());
@@ -197,7 +194,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
             return CommonResult.fail("该评分项不存在");
         }
         QueryWrapper<SmartEvaluateStudent> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("grade_id", smartSubjectTemplate.getGradeId());
         queryWrapper1.eq("term_id", smartSubjectTemplate.getTermId());
         // queryWrapper1.eq("exam_type", smartSubjectTemplate.getExamType());
@@ -207,7 +203,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
             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()) {
@@ -223,7 +218,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
     @DESRespondSecret(validated = false)
     public CommonResult queryTemplatePage(Integer currentPage, Integer pageCount) {
         QueryWrapper<SmartSubjectTemplate> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.orderByDesc("id");
         PageUtils<SmartSubjectTemplate> list = smartSubjectTemplateService.queryPageSmartSubjectTemplate(currentPage, pageCount, queryWrapper1);
         List<SmartExamtype> examtypes = smartExamtypeService.list(null);
@@ -258,7 +252,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
     @DESRespondSecret(validated = false)
     public CommonResult queryTemplateRulePage(Integer id) {
         QueryWrapper<SmartTemplateRule> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("template_id", id);
         queryWrapper1.orderByDesc("id");
         List<SmartTemplateRule> list = smartTemplateRuleService.getSmartTemplateRuleByKey(queryWrapper1);
@@ -283,7 +276,6 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
     @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()));
         }