diff --git a/resources/mybatis1/sunvote/HomeworkReportMapper.xml b/resources/mybatis1/sunvote/HomeworkReportMapper.xml index 591cfa8..c08b797 100644 --- a/resources/mybatis1/sunvote/HomeworkReportMapper.xml +++ b/resources/mybatis1/sunvote/HomeworkReportMapper.xml @@ -17,6 +17,7 @@ RIGHT_PERSENT, GET_SCORE, ANSWER, + WHETHER, HOMEWORK_ID @@ -30,6 +31,7 @@ #{RIGHT_PERSENT}, #{GET_SCORE}, #{ANSWER}, + #{WHETHER}, #{HOMEWORK_ID} @@ -64,6 +66,7 @@ RIGHT_PERSENT = #{RIGHT_PERSENT}, GET_SCORE = #{GET_SCORE}, ANSWER = #{ANSWER}, + WHETHER = #{WHETHER}, HOMEWORK_ID = #{HOMEWORK_ID} where HOMEWORK_REPORT_ID = #{HOMEWORK_REPORT_ID} @@ -167,6 +170,7 @@ #{item.GET_SCORE}, #{item.ANSWER}, #{item.HOMEWORK_ID} + #{item.WHETHER} ) diff --git a/src/com/fh/bean/ResultHomework.java b/src/com/fh/bean/ResultHomework.java index c0e05ef..c9c2981 100644 --- a/src/com/fh/bean/ResultHomework.java +++ b/src/com/fh/bean/ResultHomework.java @@ -12,6 +12,7 @@ public class ResultHomework { private String GET_SCORE_PERSENT; private String COMPLETE_DESC; private String GET_MAX_SCORE; + private String ANSWER_PERSENT; private List STUDENTS; public void setHOMEWORK_ID(String HOMEWORK_ID) { @@ -70,6 +71,16 @@ public class ResultHomework { return STUDENTS; } + + + public String getANSWER_PERSENT() { + return ANSWER_PERSENT; + } + + public void setANSWER_PERSENT(String aNSWER_PERSENT) { + ANSWER_PERSENT = aNSWER_PERSENT; + } + public static ResultHomework parse(String json){ Gson gson = new Gson(); return gson.fromJson(json, ResultHomework.class); @@ -77,6 +88,15 @@ public class ResultHomework { public static class ResultStudent { private String STUDENT_NO; + private String STUDENT_ID; + public String getSTUDENT_ID() { + return STUDENT_ID; + } + + public void setSTUDENT_ID(String sTUDENT_ID) { + STUDENT_ID = sTUDENT_ID; + } + private String STUDENT_NAME; private String KEYBOARD; private String RIGHT_PERSENT; diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index e299a14..bdb3338 100644 --- a/src/com/fh/controller/api/V1.java +++ b/src/com/fh/controller/api/V1.java @@ -2895,6 +2895,7 @@ public class V1 extends BaseController { homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT()); homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC()); homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE()); + homePd.put("ANSWER_PERSENT", resultHomework.getANSWER_PERSENT()); homePd.put("COMPLETE_COUNT", "1"); homeworkService.edit(homePd); List list = homeworkReporkService.findByHomeworkID(homePd); @@ -2911,6 +2912,7 @@ public class V1 extends BaseController { ptd.put("RIGHT_PERSENT", "0%"); ptd.put("GET_SCORE", "0"); ptd.put("ANSWER", ""); + ptd.put("WHETHER", "0"); ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID()); } // 2. 根据学生列表生成初始化成绩 @@ -2924,12 +2926,14 @@ public class V1 extends BaseController { PageData tpd = new PageData(); tpd.put("STUDENT_NAME", student.getSTUDENT_NAME()); tpd.put("STUDENT_NO", student.getSTUDENT_NO()); + tpd.put("STUDENT_ID", student.getSTUDENT_ID()); tpd.put("RANK", student.getRANK()); tpd.put("KEYBOARD", student.getKEYBOARD()); tpd.put("RIGHT_PERSENT", student.getRIGHT_PERSENT()); tpd.put("GET_SCORE", student.getGET_SCORE()); tpd.put("ANSWER", student.getANSWER()); tpd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID()); + tpd.put("WHETHER", "1"); homeworkReporkService.update(tpd); } res.setData(resultHomework.getHOMEWORK_ID());