diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index 97f6165db175b6cc66a9cb8e04fc3fbf497d844b..cf03e87025444c45d27ad869bc90108fa43949ef 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -19,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.Part; +import javax.xml.ws.Action; import java.io.IOException; import java.sql.Connection; import java.text.SimpleDateFormat; @@ -226,4 +227,14 @@ public class ToolTemplateAction extends ActionToolBase { } return userAnswersMap; } + + + //教师端获取作业 + @Action + public R getTHomeWork(HttpServletRequest request) throws Exception { + Integer id =Integer.parseInt(request.getParameter("id")); + List homeWork = homeWorkService.getTHomeWork(id); + return R.ok().put("data",homeWork); + } + } diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java index 288bbad6c8bdbae2969ed253fc7e597eb8a009a1..021b98e82f7fad69321a9b90df83288f3b85e7b0 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java +++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java @@ -15,6 +15,11 @@ public interface HomeWorkDao extends IBaseDao { List getHomeWorkByTeacherName(Connection connection, String name,int id) throws SQLException; List getHomeWorkByHomeworkName(Connection connection, String homework_name,int id) throws SQLException; + + List getTHomeWork(Connection connection, int id); + //提交作业 void submitHomework(Connection connection, Submit submitHomework); + + } diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java index 2d6419f279a224b8dba30dfc937b41e31cf86729..f5cf3eb83075fe067cb811d0443c47f1c21fd46c 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -139,6 +139,34 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa return homeworkList; } + @Override + public List getTHomeWork(Connection connection, int id) { + String sql = "SELECT homework.* FROM homework " + + "JOIN teacher ON homework.teacher_id = teacher.id " + + "WHERE teacher.id = ? "; + List homeworkList = new ArrayList<>(); + try (PreparedStatement pstm = connection.prepareStatement(sql)) { + pstm.setInt(1,id); + try (ResultSet rs = pstm.executeQuery()) { + while (rs.next()) { + HomeWork homework = new HomeWork(); + homework.setHomework_name(rs.getString("homework_name")); + homework.setStart_time(rs.getString("startTime")); + homework.setFinish_time(rs.getString("finishTime")); + homework.setUngraded(rs.getInt("ungraded")); + homework.setSubmit(rs.getInt("submit")); + homework.setUnsubmitted(rs.getInt("unsubmitted")); + homework.setAnswer(rs.getString("answer")); + homeworkList.add(homework); + } + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + return homeworkList; + } + + @Override public void submitHomework(Connection connection, Submit submitHomework) { int submitId = submitHomework.getSubmitId(); diff --git a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java index bc94be6bdaa46d9fc2c8b92aeaee66b57b472137..01569d80816b53cd0fdbc8d08046b8478ab66084 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java +++ b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java @@ -26,6 +26,14 @@ public class HomeWork { private String course_name; @Column(name = "teacher_id") private Integer teacher_id; + @Column(name ="answer") + private String answer; + @Column(name ="ungraded") + private Integer ungraded; + @Column(name ="unsubmitted") + private Integer unsubmitted; + @Column(name ="submit") + private Integer submit; private String teacher_name; private String submitStatus; diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java index aa511c49b95610fbc49b7e4c6d5022927dcdbf3b..d7d1c8beeda1719cb356e83894e5788e07cc5e7a 100644 --- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java +++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java @@ -16,5 +16,6 @@ public interface HomeWorkService { public List getHomeWorkByCourse(String course_name,int id) throws Exception; public List getHomeWorkByTeacherName(String name,int id) throws Exception; public List getHomeWorkByHomeworkName(String homework_name,int id) throws Exception; + public List getTHomeWork(int id) throws Exception; void submitHomework(Integer student_id, Integer homeworkId, Date submitTimeDate, Map> userAnswers) throws Exception; } diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java index e6672744757d434e222cd802454ce459e1685c53..19edd662a6dd8ea8749a7814e6ff48b84c232acb 100644 --- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java +++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java @@ -55,6 +55,11 @@ public class HomeWorkServiceImpl implements HomeWorkService { return homeWorkDao.getHomeWorkByHomeworkName(connection,homework_name,id); } + public List getTHomeWork(int id) throws Exception { + final Connection connection = ActionToolBase.getDBConnection(); + return homeWorkDao.getTHomeWork(connection,id); + } + // @Transactional() @Override public void submitHomework(Integer studentId, Integer homeworkId, Date submitTimeDate, Map> userAnswersMap) throws Exception { diff --git a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue index 562944316023e3576ed71e0d8bd16db2f34dafcd..6afd007013f87b9a559bff80dd4b9b58980a42c5 100644 --- a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue +++ b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue @@ -9,13 +9,13 @@ - - - - - + + + + + - + -