定时考勤

src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java

@@ -1,6 +1,7 @@
 package com.template.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.template.model.evaluate.student.SmartEvaluateStudent;
 import com.template.model.evaluate.teacher.SmartEvaluateTeacher;
 import com.template.model.request.addChildScoreManageRequest;
 import com.template.model.request.addScoreManageRequest;
@@ -71,6 +72,10 @@ public interface SmartEvaluateTeacherControllerAPI {
     @ApiOperation(value = "查看教师评分", httpMethod = "POST")
     CommonResult getTeacherScoreList(@Validated @RequestBody SmartEvaluateTeacher smartEvaluateTeacher, Integer currentPage, Integer pageCount);
 
+    @RequestMapping(value = "/getTEvaluationExcel")
+    @ApiOperation(value = "导出教师素质评价", httpMethod = "POST")
+    CommonResult getTEvaluationExcel(@Validated @RequestBody SmartEvaluateTeacher smartEvaluateTeacher, HttpServletResponse response, BindingResult bindingResult);
+
     @RequestMapping(value = "/getTeacherScoreExcel")
     @ApiOperation(value = "导出教师评分", httpMethod = "POST")
     void getTeacherScoreExcel(SmartEvaluateTeacher smartEvaluateTeacher, HttpServletResponse response);

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

@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 @Component
@@ -82,7 +83,7 @@ public class ScheduleController {
     //周一到周五早上七点执行：0 0 7 ? * MON-FRI
     //0 0 22 * * ?
     @Async
-    @Scheduled(cron = "0 0 */1 * * ?")
+    @Scheduled(cron = "0 0 */1 * * ?")//一个小时
     @Transactional(rollbackFor = {Exception.class})
     public void autoDispatch() throws Exception {
 
@@ -103,13 +104,9 @@ public class ScheduleController {
 //            classes.add(classData);
 
                 //当天已存在的考勤数据 判断是否重复使用
-                List<SmartAttendance> attendanceList = smartAttendanceService.queryAttendances(TimeExchange.getStartOfDayStr(new Date()), TimeExchange.getEndOfDayStr(new Date()));
+                List<SmartAttendance> attendanceList = smartAttendanceService.queryAttendancesNoleave(TimeExchange.getStartOfDayStr(new Date()), TimeExchange.getEndOfDayStr(new Date()));
 
                 for (SmartClass data : classes) {
-
-                    if (data.getName().equals("七年级21班")) {
-                        String sd = "";
-                    }
                     Optional<SmartGrade> oGrade = grades.stream().filter(e -> e.getId().equals(data.getGradeId())).findFirst();
                     //region 获取考勤事件ID
                     //初始化客户端
@@ -140,19 +137,17 @@ public class ScheduleController {
                     //endregion
 
                     //考勤事件ID
-                    List<String> eventIds = new ArrayList<>();
+                    List<AttendanceRuleListEventByClazzResult.DataItem> eventItems = new ArrayList<>();
 
                     if (result != null && result.getResponseBody().getCode().equals("000000")) {
                         if (result.getResponseBody().getData() != null) {
-                            List<AttendanceRuleListEventByClazzResult.DataItem> eventItems = result.getResponseBody().getData();
-                            for (AttendanceRuleListEventByClazzResult.DataItem eventItem : eventItems) {
-                                eventIds.add(eventItem.getRuleId());
-                            }
+                            eventItems = result.getResponseBody().getData();
                         }
                     }
                     //endregion
 
-                    for (String eventId : eventIds) {
+                    for (AttendanceRuleListEventByClazzResult.DataItem eventId : eventItems) {
+
                         /**
                          * 定时获取考勤
                          */
@@ -165,7 +160,7 @@ public class ScheduleController {
                         kParam.setRequestBody(kRequestBody);
                         //query
                         AttendanceServiceListAttendClassRecordsParam.Query kQuery = AttendanceServiceListAttendClassRecordsParam.Query.builder()
-                                .eventId(eventId)//考勤事件ID 固定写死
+                                .eventId(eventId.getRuleId())//考勤事件ID 固定写死
                                 .attendDate(TimeExchange.getDate())//考勤日期
                                 .appId(seewoConfig.getAppId())//appid
                                 .grade(oGrade != null && oGrade.isPresent() ? oGrade.get().getGradeNo() : 1)//年级序号
@@ -186,24 +181,53 @@ public class ScheduleController {
                         if (kResult != null && kResult.getResponseBody().getCode().equals("000000")) {
                             List<AttendanceServiceListAttendClassRecordsResult.RecordsItem> items = kResult.getResponseBody().getData().getRecords();
                             if (students != null && students.size() > 0 && items != null && items.size() > 0) {
-                                for (AttendanceServiceListAttendClassRecordsResult.RecordsItem item : items) {
-                                    Optional<SmartUser> student = students.stream().filter(e -> e.getXwStudentUid().equals(item.getUserUid())).findFirst();
-                                    if (student != null && student.isPresent()) {
 
-                                        Optional<SmartAttendance> existData = attendanceList.stream().filter(e -> e.getUserId().equals(student.get().getId())
-                                                && e.getClassId().equals(student.get().getSchoolClass()) &&  StringUtils.hasText(item.getAttendTime()) && e.getAttendTime().equals(TimeExchange.StringToDate((TimeExchange.getDate() + " " + item.getAttendTime()), "yyyy-MM-dd HH:mm:ss"))).findFirst();
-                                        if (!(existData != null && existData.isPresent())) {
-                                            if(item.getStatus().intValue() != 6){//请假数据不通过考勤接口拿 因为考勤给的请假数据没有请假原因和请假时长
-                                                SmartAttendance attendance = new SmartAttendance();
-                                                attendance.setUserId(student.get().getId());
-                                                attendance.setUserUid(item.getUserUid());
-                                                attendance.setClassId(student.get().getSchoolClass());
-                                                attendance.setClassUid(kResult.getResponseBody().getData().getClassUid());
-                                                attendance.setXwUserName(item.getUserName());
-                                                attendance.setXwStudentCode(item.getStudentCode());
-                                                attendance.setAttendTime(StringUtils.hasText(item.getAttendTime()) ? TimeExchange.StringToDate((TimeExchange.getDate() + " " + item.getAttendTime()), "yyyy-MM-dd HH:mm:ss") : new Date());
-                                                attendance.setStatus(item.getStatus());
-                                                attendances.add(attendance);
+                                List<String> uids = items.stream().map(AttendanceServiceListAttendClassRecordsResult.RecordsItem::getUserUid).distinct().collect(Collectors.toList());
+                                for (String uid : uids) {
+                                    Optional<SmartUser> student = students.stream().filter(e -> e.getXwStudentUid().equals(uid)).findFirst();
+                                    if (student != null && student.isPresent()) {
+                                        List<SmartAttendance> oldAttends = attendanceList.stream().filter(e -> e.getUserId().equals(student.get().getId())
+                                                && e.getRuleId() != null && e.getRuleId().equals(eventId.getRuleId())).collect(Collectors.toList());
+                                        List<AttendanceServiceListAttendClassRecordsResult.RecordsItem> newAttends = items.stream().filter(e -> e.getUserUid().equals(student.get().getXwStudentUid())).collect(Collectors.toList());
+                                        if (newAttends != null && newAttends.size() > 0) {
+                                            int i = 0;
+                                            for (AttendanceServiceListAttendClassRecordsResult.RecordsItem newAttend : newAttends) {
+                                                if (newAttend.getStatus().intValue() != 6) {//请假数据不通过考勤接口拿 因为考勤给的请假数据没有请假原因和请假时长
+                                                    if (oldAttends.size() > i) {
+                                                        SmartAttendance oldData = new SmartAttendance();
+                                                        oldData = oldAttends.get(i);
+                                                        boolean isUpdate = false;
+                                                        Date AttendTime = StringUtils.hasText(newAttend.getAttendTime()) ? TimeExchange.StringToDate((TimeExchange.getDate() + " " + newAttend.getAttendTime()), "yyyy-MM-dd HH:mm:ss") : TimeExchange.StringToDate((TimeExchange.getDate() + " " + eventId.getAttendEndTime() + ":00"), "yyyy-MM-dd HH:mm:ss");
+                                                        if (oldData.getAttendTime().compareTo(AttendTime) != 0) {
+                                                            oldData.setAttendTime(AttendTime);
+                                                            isUpdate = true;
+                                                        }
+                                                        if (newAttend.getStatus().intValue() != oldData.getStatus()) {
+                                                            oldData.setStatus(newAttend.getStatus());
+                                                            isUpdate = true;
+                                                        }
+                                                        if (!eventId.getRuleId().equals(oldData.getRuleId())) {
+                                                            oldData.setRuleId(eventId.getRuleId());
+                                                            isUpdate = true;
+                                                        }
+                                                        if (isUpdate) {
+                                                            attendances.add(oldData);
+                                                        }
+
+                                                    } else {
+                                                        SmartAttendance attendance = new SmartAttendance();
+                                                        attendance.setUserId(student.get().getId());
+                                                        attendance.setUserUid(newAttend.getUserUid());
+                                                        attendance.setClassId(student.get().getSchoolClass());
+                                                        attendance.setClassUid(kResult.getResponseBody().getData().getClassUid());
+                                                        attendance.setXwUserName(newAttend.getUserName());
+                                                        attendance.setXwStudentCode(newAttend.getStudentCode());
+                                                        attendance.setAttendTime(StringUtils.hasText(newAttend.getAttendTime()) ? TimeExchange.StringToDate((TimeExchange.getDate() + " " + newAttend.getAttendTime()), "yyyy-MM-dd HH:mm:ss") : TimeExchange.StringToDate((TimeExchange.getDate() + " " + eventId.getAttendEndTime() + ":00"), "yyyy-MM-dd HH:mm:ss"));
+                                                        attendance.setStatus(newAttend.getStatus());
+                                                        attendance.setRuleId(eventId.getRuleId());
+                                                        attendances.add(attendance);
+                                                    }
+                                                }
                                             }
                                         }
                                     }
@@ -214,10 +238,11 @@ public class ScheduleController {
                 }
 
                 if (attendances.size() > 0) {
-                    smartAttendanceService.saveBatch(attendances);
+                    smartAttendanceService.saveOrUpdateBatch(attendances);
                 }
             }
-        } catch (Exception e) {
+        } catch (
+                Exception e) {
             logger.info("考勤定时任务失败：" + e.getMessage());
             throw new Exception("考勤定时任务失败" + e.getMessage());
         }

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

@@ -298,6 +298,9 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         PageUtils<SmartSubjectTemplate> list = smartSubjectTemplateService.queryPageSmartSubjectTemplate(currentPage, pageCount, queryWrapper1);
         List<SmartExamtype> examtypes = smartExamtypeService.list(null);
         if (list.getList() != null && list.getList().size() > 0) {
+            List<Integer> gradeIds = list.getList().stream().map(SmartSubjectTemplate::getGradeId).distinct().collect(Collectors.toList());
+            List<Integer> termIds =list.getList().stream().map(SmartSubjectTemplate::getTermId).distinct().collect(Collectors.toList());
+            List<SmartEvaluateStudent> eStudents = smartEvaluateStudentService.queryUseEvaluateStudents(gradeIds, termIds);
             for (SmartSubjectTemplate data : list.getList()) {
                 List<SmartTermTemplate> examTypeDatas = new ArrayList<>();
                 List<String> names = new ArrayList<>();
@@ -318,6 +321,15 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
                     data.setExamType(StringUtils.join(names, ","));
                 }
                 data.setExamTypes(examTypeDatas);
+
+                data.setIsUse(0);
+                if(eStudents != null && eStudents.size() > 0){
+                    long existCount =  eStudents.stream().filter(e -> e.getTermId().intValue() == data.getTermId().intValue()
+                            && e.getGradeId().intValue() == data.getGradeId().intValue()).count();
+                    if(existCount > 0){
+                        data.setIsUse(1);
+                    }
+                }
             }
 
         }

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

@@ -10,6 +10,7 @@ import com.template.api.SmartEvaluateTeacherControllerAPI;
 import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.UUIDUtil;
 import com.template.common.utils.paramUtils;
+import com.template.model.evaluate.student.SmartEvaluateStudent;
 import com.template.model.evaluate.teacher.*;
 import com.template.model.pojo.SmartScore;
 import com.template.model.pojo.SmartSemester;
@@ -21,6 +22,7 @@ import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.EvaluateTeacherVo;
 import com.template.model.vo.RankingVo;
+import com.template.model.vo.TemplateRuleVo;
 import com.template.services.*;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -270,7 +272,6 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
         }
         Integer term = allList.get(0).getTermId();
         QueryWrapper<SmartEvaluateTdetail> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("term_id", term);
         List<SmartEvaluateTdetail> smartEvaluateTdetails = smartEvaluateTdetailService.getEvaluateTdetailByKey(queryWrapper1);
         if (smartEvaluateTdetails.size() > 0) {
@@ -338,7 +339,6 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
     @PassToken
     public CommonResult getTeacherScoreList(SmartEvaluateTeacher smartEvaluateTeacher, Integer currentPage, Integer pageCount) {
         QueryWrapper<SmartEvaluateTeacher> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("deleted", 0);
         if (smartEvaluateTeacher.getName() != null && !smartEvaluateTeacher.getName().trim().equals("")) {
             queryWrapper.and(qw -> qw.like("name", smartEvaluateTeacher.getName()).or().like("card_no", smartEvaluateTeacher.getName()));
         }
@@ -357,8 +357,8 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
             List<Integer> userIds = list.getList().stream().map(SmartEvaluateTeacher::getUserId).distinct().collect(Collectors.toList());
             List<SmartUser> users = smartUserService.getSmartUserByIds(userIds);
             for (SmartEvaluateTeacher data : list.getList()) {
-                Optional<SmartUser> oUser = users.stream().filter(e -> e.getId().intValue() ==data.getUserId().intValue()).findFirst();
-                if(oUser != null && oUser.isPresent()){
+                Optional<SmartUser> oUser = users.stream().filter(e -> e.getId().intValue() == data.getUserId().intValue()).findFirst();
+                if (oUser != null && oUser.isPresent()) {
                     data.setHeadImage(oUser.get().getHeadImage());
                 }
             }
@@ -366,6 +366,62 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
         return CommonResult.ok(list);
     }
 
+    @Override
+    public CommonResult getTEvaluationExcel(SmartEvaluateTeacher smartEvaluateTeacher, HttpServletResponse response, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+        //导出
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("教师综评管理");
+        Row headerRow = sheet.createRow(0);
+        headerRow.createCell(0).setCellValue("学期");
+        headerRow.createCell(1).setCellValue("年级");
+        headerRow.createCell(2).setCellValue("教师姓名");
+        headerRow.createCell(3).setCellValue("职工号");
+        headerRow.createCell(4).setCellValue("带教班级");
+        headerRow.createCell(5).setCellValue("扣分");
+        headerRow.createCell(6).setCellValue("最终评分");
+
+        QueryWrapper<SmartEvaluateTeacher> queryWrapper = new QueryWrapper<>();
+        if (smartEvaluateTeacher.getName() != null && !smartEvaluateTeacher.getName().trim().equals("")) {
+            queryWrapper.and(qw -> qw.like("name", smartEvaluateTeacher.getName()).or().like("card_no", smartEvaluateTeacher.getName()));
+        }
+        if (smartEvaluateTeacher.getTerm() != null && !smartEvaluateTeacher.getTerm().trim().equals("")) {
+            queryWrapper.like("term", smartEvaluateTeacher.getTerm());
+        }
+        if (smartEvaluateTeacher.getClassName() != null && !smartEvaluateTeacher.getClassName().trim().equals("")) {
+            queryWrapper.eq("class_name", smartEvaluateTeacher.getClassName());
+        }
+        if (smartEvaluateTeacher.getGradeName() != null && !smartEvaluateTeacher.getGradeName().trim().equals("")) {
+            queryWrapper.eq("grade_name", smartEvaluateTeacher.getGradeName());
+        }
+        queryWrapper.orderByDesc("term");
+        List<SmartEvaluateTeacher> list = smartEvaluateTeacherService.queryPageSmartEvaluateTeacher(queryWrapper);
+        if (list != null && list.size() > 0) {
+            for (int i = 0;i < list.size();i++) {
+                SmartEvaluateTeacher data = list.get(i);
+
+                Row dataRow = sheet.createRow(i + 1);
+                dataRow.createCell(0).setCellValue(data.getTerm());
+                dataRow.createCell(1).setCellValue(data.getGradeName());
+                dataRow.createCell(2).setCellValue(data.getName());
+                dataRow.createCell(3).setCellValue(data.getCardNo());
+                dataRow.createCell(4).setCellValue(data.getClassName());
+                dataRow.createCell(5).setCellValue(data.getLowingScore());
+                dataRow.createCell(6).setCellValue(data.getTotalScore());
+                i++;
+            }
+        }
+
+        // 将工作簿写入文件
+        ExcelUtils.excelDownload(workbook, "教师综评管理.xlsx", response);
+
+
+        return CommonResult.ok("导出成功");
+    }
+
     @PassToken
     public void getTeacherScoreExcel(SmartEvaluateTeacher smartEvaluateTeacher, HttpServletResponse response) {
         String term = smartScoreManageService.getMaxTerm();
@@ -392,7 +448,6 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
         headerRow.createCell(3).setCellValue("学期");
         headerRow.createCell(4).setCellValue("班级");
         QueryWrapper<SmartScoreManage> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("parent_id", 0);
         queryWrapper1.eq("term", term);
         List<SmartScoreManage> scoreManageList = smartScoreManageService.getScoreManageByKey(queryWrapper1);
@@ -554,7 +609,6 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
     public CommonResult getScoreComparison(Integer id) {
         SmartEvaluateTeacher teacher = smartEvaluateTeacherService.getSmartEvaluateTeacherById(id);
         QueryWrapper<SmartEvaluateTdetail> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("term_id", teacher.getTermId());
         List<SmartEvaluateTdetail> detailList = smartEvaluateTdetailService.getEvaluateTdetailByKey(queryWrapper1);
         int teacherCount = smartEvaluateTeacherService.queryTeacherCount(teacher.getTermId());
@@ -595,7 +649,6 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
     public CommonResult getScoreRank(int currentPage, int pageCount, String subject) {
         QueryWrapper<SmartEvaluateTeacher> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("term", smartScoreManageService.getMaxTerm());
-        queryWrapper1.eq("deleted", 0);
         if (subject != null) {
             queryWrapper1.eq("subject", subject);
         }

src/main/java/com/template/model/evaluate/student/SmartSubjectTemplate.java

@@ -56,6 +56,14 @@ public class SmartSubjectTemplate implements Serializable {
     @TableField(exist = false)
     private List<SmartTermTemplate> examTypes;
 
+    /**
+     * 是否被使用
+     * 否：0
+     * 是：1
+     */
+    @TableField(exist = false)
+    private Integer isUse;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/model/pojo/SmartAttendance.java

@@ -91,6 +91,9 @@ public class SmartAttendance implements Serializable {
     @ApiModelProperty(value = "请假核销（0：未核销，1：已核销）")
     private Integer ifVerification;
 
+    @ApiModelProperty(value = "考勤规则ID")
+    private String ruleId;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

src/main/java/com/template/services/SmartAttendanceService.java

@@ -23,6 +23,8 @@ public interface SmartAttendanceService extends IService<SmartAttendance> {
 
     List<SmartAttendance> queryExistAttendances(String startDate, String endDate);
 
+    List<SmartAttendance> queryAttendancesNoleave(String startDate, String endDate);
+
     boolean insertAttendanceBatch(List<SmartAttendance> attendances);
 
     List<SmartAttendance> queryAttendanceList(Date startMonth, Date endMonth);

src/main/java/com/template/services/SmartEvaluateStudentService.java

@@ -53,4 +53,6 @@ public interface SmartEvaluateStudentService extends IService<SmartEvaluateStude
 
     SmartEvaluateStudent getEvaluateStudent(Integer userId, Integer semesterId);
 
+    List<SmartEvaluateStudent> queryUseEvaluateStudents(List<Integer> gradeIds, List<Integer> termIds);
+
 }

src/main/java/com/template/services/SmartEvaluateTeacherService.java

@@ -25,6 +25,8 @@ public interface SmartEvaluateTeacherService extends IService<SmartEvaluateTeach
 
     PageUtils<SmartEvaluateTeacher> queryPageSmartEvaluateTeacher(int currentPage, int pageCount, QueryWrapper<SmartEvaluateTeacher> queryWrapper);
 
+    List<SmartEvaluateTeacher> queryPageSmartEvaluateTeacher(QueryWrapper<SmartEvaluateTeacher> queryWrapper);
+
     int deleteSmartEvaluateTeacherById(int id);
 
     SmartEvaluateTeacher getSmartEvaluateTeacherById(int id);

src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java

@@ -35,6 +35,18 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
     private SmartAttendanceMapper smartAttendanceMapper;
 
     @Override
+    public List<SmartAttendance> queryAttendancesNoleave(String startDate, String endDate) {
+
+        QueryWrapper<SmartAttendance> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(StringUtils.hasText(startDate), "attend_time", startDate);//大于等于
+        queryWrapper.le(StringUtils.hasText(endDate), "attend_time", endDate);//小于等于
+        queryWrapper.ne("status", 6);//不等于
+
+        List<SmartAttendance> result = smartAttendanceMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
     public List<SmartAttendance> queryAttendances(String startDate, String endDate) {
 
         QueryWrapper<SmartAttendance> queryWrapper = new QueryWrapper<>();

src/main/java/com/template/services/impl/SmartEvaluateStudentServiceImpl.java

@@ -45,13 +45,13 @@ public class SmartEvaluateStudentServiceImpl extends ServiceImpl<SmartEvaluateSt
     @Override
     public PageUtils<SmartEvaluateStudent> queryPageSmartEvaluateStudent(int currentPage, int pageCount, QueryWrapper<SmartEvaluateStudent> queryWrapper) {
         Page<SmartEvaluateStudent> page = new Page<>(currentPage, pageCount);
-        IPage<SmartEvaluateStudent> result = smartEvaluateStudentMapper.selectPage(page,queryWrapper);
+        IPage<SmartEvaluateStudent> result = smartEvaluateStudentMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
     @Override
     public List<SmartEvaluateStudent> queryPageSmartEvaluateStudent(QueryWrapper<SmartEvaluateStudent> queryWrapper) {
-         List<SmartEvaluateStudent> result = smartEvaluateStudentMapper.selectList(queryWrapper);
+        List<SmartEvaluateStudent> result = smartEvaluateStudentMapper.selectList(queryWrapper);
 
         return result;
     }
@@ -84,9 +84,9 @@ public class SmartEvaluateStudentServiceImpl extends ServiceImpl<SmartEvaluateSt
 
     @Override
     public SmartEvaluateStudent getTeacherMessage(String cardNo, String name) {
-        LambdaQueryWrapper<SmartEvaluateStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(SmartEvaluateStudent::getTerm,name)
-                .eq(SmartEvaluateStudent::getCardNo,cardNo);
+        LambdaQueryWrapper<SmartEvaluateStudent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SmartEvaluateStudent::getTerm, name)
+                .eq(SmartEvaluateStudent::getCardNo, cardNo);
         SmartEvaluateStudent ses = this.getOne(wrapper);
         return ses;
     }
@@ -99,8 +99,8 @@ public class SmartEvaluateStudentServiceImpl extends ServiceImpl<SmartEvaluateSt
     @Override
     public List<SmartEvaluateStudent> getEvaluateStudents(List<Integer> userIds, List<Integer> semesterIds) {
         QueryWrapper<SmartEvaluateStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("user_id",userIds);
-        queryWrapper.in("term_id",semesterIds);
+        queryWrapper.in("user_id", userIds);
+        queryWrapper.in("term_id", semesterIds);
         List<SmartEvaluateStudent> evaluateStudents = smartEvaluateStudentMapper.selectList(queryWrapper);
         return evaluateStudents;
     }
@@ -108,8 +108,8 @@ public class SmartEvaluateStudentServiceImpl extends ServiceImpl<SmartEvaluateSt
     @Override
     public List<SmartEvaluateStudent> getEvaluateStudents(List<Integer> userIds, Integer semesterId) {
         QueryWrapper<SmartEvaluateStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("user_id",userIds);
-        queryWrapper.eq("term_id",semesterId);
+        queryWrapper.in("user_id", userIds);
+        queryWrapper.eq("term_id", semesterId);
         List<SmartEvaluateStudent> evaluateStudents = smartEvaluateStudentMapper.selectList(queryWrapper);
         return evaluateStudents;
     }
@@ -123,10 +123,20 @@ public class SmartEvaluateStudentServiceImpl extends ServiceImpl<SmartEvaluateSt
     @Override
     public SmartEvaluateStudent getEvaluateStudent(Integer userId, Integer semesterId) {
         QueryWrapper<SmartEvaluateStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("user_id",userId);
-        queryWrapper.in("term_id",semesterId);
+        queryWrapper.in("user_id", userId);
+        queryWrapper.in("term_id", semesterId);
         SmartEvaluateStudent result = smartEvaluateStudentMapper.selectOne(queryWrapper);
         return result;
     }
 
+    @Override
+    public List<SmartEvaluateStudent> queryUseEvaluateStudents(List<Integer> gradeIds, List<Integer> termIds) {
+        QueryWrapper<SmartEvaluateStudent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("grade_id", gradeIds);
+        queryWrapper.in("term_id", termIds);
+        queryWrapper.gt("score_num", 0);
+        List<SmartEvaluateStudent> result = smartEvaluateStudentMapper.selectList(queryWrapper);
+        return result;
+    }
+
 }

src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java

@@ -49,6 +49,12 @@ public class SmartEvaluateTeacherServiceImpl extends ServiceImpl<SmartEvaluateTe
     }
 
     @Override
+    public List<SmartEvaluateTeacher> queryPageSmartEvaluateTeacher(QueryWrapper<SmartEvaluateTeacher> queryWrapper) {
+        List<SmartEvaluateTeacher> result = smartEvaluateTeacherMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
     public int deleteSmartEvaluateTeacherById(int id) {
         int result = smartEvaluateTeacherMapper.deleteById(id);
         return result;