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..fad1f8fdbcb754c2166ae532df1cccc98931b4cf 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -17,7 +17,7 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa @Override public List getHomeWork(Connection connection, int id) throws SQLException { // SQL语句 - String sql ="SELECT homework.*,teacher.name , submit.submitStatus FROM homework " + + String sql ="SELECT homework.*,teacher.name,submit.submitStatus,submit.score FROM homework " + "JOIN teacher ON homework.teacher_id = teacher.id " + "LEFT JOIN submit ON submit.student_id = ? AND homework.homework_id = submit.homework_id "; List homeworkList = new ArrayList<>(); @@ -34,12 +34,13 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa homework.setHomework_name(rs.getString("homework_name")); homework.setCourse_name(rs.getString("course_name")); homework.setTeacher_name(rs.getString("name")); - homework.setHomework_name(rs.getString("homework_name")); + homework.setScore(rs.getDouble("score")); if (rs.getInt("submitStatus") == 0){ homework.setSubmitStatus("未提交"); }else { homework.setSubmitStatus("已提交"); } + homeworkList.add(homework); } } diff --git a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java index bc94be6bdaa46d9fc2c8b92aeaee66b57b472137..7603250ae5cd62c9bc987dc257155db506315c0a 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java +++ b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java @@ -27,6 +27,8 @@ public class HomeWork { @Column(name = "teacher_id") private Integer teacher_id; + + private Double score; private String teacher_name; private String submitStatus; diff --git a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue index 664e33d3461589ce744b72c899d1fa2bafa79540..baf9250b277ffe858e5e74915306880194fb3f92 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue @@ -1,18 +1,24 @@