diff --git a/src/main/java/com/yipin/liuwanr/mapper/ExperimentallearningMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ExperimentallearningMapper.java index f5710c4..6d12e73 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ExperimentallearningMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ExperimentallearningMapper.java @@ -123,6 +123,6 @@ public interface ExperimentallearningMapper { @Select("select DISTINCT hpm.projectId,projectName,isAttendance from hr_project_management hpm left join teacher_project tp on hpm.projectId=tp.projectId " + - " where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and tp.isOpenProject=0") + " where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and tp.isOpenProject=0 and hpm.isShow=0") List getBycourseId(@Param("experimentalClassId")Integer experimentalClassId,@Param("courseId") Integer courseId); } diff --git a/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java b/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java index 914fb02..e7996bc 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java @@ -27,7 +27,7 @@ public interface TeacherProjectAndCourseMapper { // ""}) @Select("select DISTINCT hpm.projectId,projectName,isOpenProject,isAttendance from hr_project_management hpm left join teacher_project tp on hpm.projectId=tp.projectId " + - " where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId}") + " where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and hpm.isShow=0 ") List getBySystemId(@Param("courseId") Integer courseId,@Param("experimentalClassId")Integer experimentalClassId); diff --git a/src/main/java/com/yipin/liuwanr/service/ExperimentallearningService.java b/src/main/java/com/yipin/liuwanr/service/ExperimentallearningService.java index 0c06874..c8f2d5c 100644 --- a/src/main/java/com/yipin/liuwanr/service/ExperimentallearningService.java +++ b/src/main/java/com/yipin/liuwanr/service/ExperimentallearningService.java @@ -49,7 +49,7 @@ public class ExperimentallearningService { for (int i = 0; i < projects.size(); i++) { Project_Management project = projects.get(i); // 教师那边开启了考勤,学生这边才可以有是否已经签到 - if (project.getIsAttendance() == 0) { + if (project.getIsAttendance() == 1) { // 判断该学生签到的项目,是否在开启的项目中 if (projectIds.contains(project.getProjectId())) { project.setSignin(0);