diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp index 23ec00e..d3e4f0b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp @@ -23,7 +23,8 @@ -
+ +
@@ -37,9 +38,9 @@ - - - + +
@@ -85,14 +86,14 @@ ${vs.index+1} - ${var.NAME} + ${var.NAME} ${var.CREATE_DATE} ${var.COMPLETE_DATE} ${var.QUESTIOM_COUNT} ${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"} ${var.ALL_SCORE} - + @@ -110,7 +111,7 @@
- +
@@ -145,6 +146,10 @@ todayHighlight: true }); }); + + function tosearch(){ + $("#Form").submit(); + } function edit(Id){ window.top.modal.init({ 'title':'布置练习', diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml index 4047320..8d0c3fd 100644 --- a/resources/mybatis1/sunvote/HomeworkMapper.xml +++ b/resources/mybatis1/sunvote/HomeworkMapper.xml @@ -155,8 +155,14 @@ and TEACHER_ID = #{pd.TEACHER_ID} - - and COMPLETE_DATE > #{pd.COMPLETE_DATE} + + and COMPLETE_DATE = #{pd.COMPLETE_DATE} + + + and COMPLETE_DATE > #{pd.STARTDATE} + + + and COMPLETE_DATE < #{pd.ENDDATE} diff --git a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml index 0cca4bf..87a4df7 100644 --- a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml +++ b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml @@ -137,8 +137,8 @@ from where 1 = 1 - - and HOMEWORK_ID = #{HOMEWORK_ID} + + and CODE = #{CODE} and P_HOMEWORK_PROBLEM_ID is NULL diff --git a/src/com/fh/bean/HomeClass.java b/src/com/fh/bean/HomeClass.java new file mode 100644 index 0000000..babbde4 --- /dev/null +++ b/src/com/fh/bean/HomeClass.java @@ -0,0 +1,20 @@ +package com.fh.bean; + +public class HomeClass { + + private String CLASS_ID; + private String COMPLETE_DATE; + public void setCLASS_ID(String CLASS_ID) { + this.CLASS_ID = CLASS_ID; + } + public String getCLASS_ID() { + return CLASS_ID; + } + + public void setCOMPLETE_DATE(String COMPLETE_DATE) { + this.COMPLETE_DATE = COMPLETE_DATE; + } + public String getCOMPLETE_DATE() { + return COMPLETE_DATE; + } +} diff --git a/src/com/fh/bean/Homework.java b/src/com/fh/bean/Homework.java new file mode 100644 index 0000000..d8f03eb --- /dev/null +++ b/src/com/fh/bean/Homework.java @@ -0,0 +1,101 @@ +package com.fh.bean; + +import java.util.List; + +import com.google.gson.Gson; + +public class Homework { + + private String CODE; + private String NAME; + private String SUBJECT_ID; + private String ALL_SCORE; + private String HOMEWORK_DESC; + private List CLASSLIST; + private String QUESTION_COUNT; + private String TEACHER_ID; + private List QUESTIOMS; + + public void setCODE(String CODE) { + this.CODE = CODE; + } + + public String getCODE() { + return CODE; + } + + public void setNAME(String NAME) { + this.NAME = NAME; + } + + public String getNAME() { + return NAME; + } + + public void setSUBJECT_ID(String SUBJECT_ID) { + this.SUBJECT_ID = SUBJECT_ID; + } + + public String getSUBJECT_ID() { + return SUBJECT_ID; + } + + public void setALL_SCORE(String ALL_SCORE) { + this.ALL_SCORE = ALL_SCORE; + } + + public String getALL_SCORE() { + return ALL_SCORE; + } + + public void setHOMEWORK_DESC(String HOMEWORK_DESC) { + this.HOMEWORK_DESC = HOMEWORK_DESC; + } + + public String getHOMEWORK_DESC() { + return HOMEWORK_DESC; + } + + public void setCLASSLIST(List CLASSLIST) { + this.CLASSLIST = CLASSLIST; + } + + public List getCLASSLIST() { + return CLASSLIST; + } + + public void setQUESTIOM_COUNT(String QUESTIOM_COUNT) { + this.QUESTION_COUNT = QUESTIOM_COUNT; + } + + public String getQUESTION_COUNT() { + return QUESTION_COUNT; + } + + public void setQUESTIOMS(List QUESTIOMS) { + this.QUESTIOMS = QUESTIOMS; + } + + public List getQUESTIOMS() { + return QUESTIOMS; + } + + + + public String getTEACHER_ID() { + return TEACHER_ID; + } + + public void setTEACHER_ID(String tEACHER_ID) { + TEACHER_ID = tEACHER_ID; + } + + public void setQUESTION_COUNT(String qUESTION_COUNT) { + QUESTION_COUNT = qUESTION_COUNT; + } + + public static Homework parse(String json) { + Gson gson = new Gson(); + return gson.fromJson(json, Homework.class); + } +} diff --git a/src/com/fh/bean/HomeworkQuestion.java b/src/com/fh/bean/HomeworkQuestion.java new file mode 100644 index 0000000..ec87d4d --- /dev/null +++ b/src/com/fh/bean/HomeworkQuestion.java @@ -0,0 +1,60 @@ +package com.fh.bean; + +public class HomeworkQuestion { + + private String RANK; + private String NAME; + private String OPTION_NUM; + private String SCORE; + private String RIGHT_ANSWER; + private String TYPE; + + public void setRANK(String RANK) { + this.RANK = RANK; + } + + public String getRANK() { + return RANK; + } + + public void setNAME(String NAME) { + this.NAME = NAME; + } + + public String getNAME() { + return NAME; + } + + public void setOPTION_NUM(String OPTION_NUM) { + this.OPTION_NUM = OPTION_NUM; + } + + public String getOPTION_NUM() { + return OPTION_NUM; + } + + public void setSCORE(String SCORE) { + this.SCORE = SCORE; + } + + public String getSCORE() { + return SCORE; + } + + public void setRIGHT_ANSWER(String RIGHT_ANSWER) { + this.RIGHT_ANSWER = RIGHT_ANSWER; + } + + public String getRIGHT_ANSWER() { + return RIGHT_ANSWER; + } + + public void setTYPE(String TYPE) { + this.TYPE = TYPE; + } + + public String getTYPE() { + return TYPE; + } + +} diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index f5bab5e..b895492 100644 --- a/src/com/fh/controller/api/V1.java +++ b/src/com/fh/controller/api/V1.java @@ -2851,6 +2851,7 @@ public class V1 extends BaseController { public String homework() throws Exception { ResponseGson> res = new ResponseGson>(); PageData pageData = this.getPageData(); + pageData.put("CODE", pageData.get("HOMEWORK_ID")); List list = homeworkproblemService.listProblem(pageData); for(PageData pd : list){ if(pd.get("P_HOMEWORK_PROBLEM_ID") != null){ diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 90b80ad..d27af3a 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -19,11 +19,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import com.fh.bean.HomeClass; +import com.fh.bean.Homework; +import com.fh.bean.HomeworkQuestion; import com.fh.controller.api.ResponseGson; import com.fh.controller.base.BaseController; import com.fh.entity.Page; import com.fh.service.sunvote.homework.HomeworkManager; import com.fh.service.sunvote.homework.HomeworkReportManager; +import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager; import com.fh.util.AppUtil; import com.fh.util.Jurisdiction; import com.fh.util.ObjectExcelView; @@ -42,6 +46,9 @@ public class HomeworkController extends BaseController { private HomeworkManager homeworkService; @Resource(name = "homeworkReporService") private HomeworkReportManager homeworkReporService; + + @Resource(name="homeworkproblemService") + private HomeworkProblemManager homeworkproblemService; /** * 保存 @@ -155,6 +162,7 @@ public class HomeworkController extends BaseController { mv.addObject("pd", pd); return mv; } + /** * 去修改页面 * @@ -278,7 +286,7 @@ public class HomeworkController extends BaseController { Gson gson = new Gson(); return gson.toJson(pd); } - + /** * 列表 * @@ -299,15 +307,65 @@ public class HomeworkController extends BaseController { Gson gson = new Gson(); return gson.toJson(varList); } - - @RequestMapping(value = "/savedata") + + @RequestMapping(value = "/savedata", produces = "application/json;charset=UTF-8") + @ResponseBody public String savedata() throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - pd.put("HOMEWORK_ID", this.get32UUID()); // 主键 + pd.put("HOMEWORK_ID", this.get32UUID()); homeworkService.save(pd); ResponseGson responseGson = new ResponseGson(); responseGson.setData(pd.getString("HOMEWORK_ID")); return responseGson.toJson(); } + + @RequestMapping(value = "/uploadHomework", produces = "application/json;charset=UTF-8") + @ResponseBody + public String uploadHomework() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String data = pd.getJsonString(); + ResponseGson responseGson = new ResponseGson(); + + Homework homework = Homework.parse(data); + + PageData hpd = new PageData(); + hpd.put("CODE", get32UUID()); + hpd.put("NAME", homework.getNAME()); + hpd.put("SUBJECT_ID", homework.getSUBJECT_ID()); + hpd.put("ALL_SCORE", homework.getALL_SCORE()); + hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC()); + hpd.put("QUESTION_COUNT", homework.getQUESTION_COUNT()); + hpd.put("CREATE_DATE", format.format(new Date())); + hpd.put("MODIFY_DATE", format.format(new Date())); + hpd.put("COMPLETE_COUNT", 0); + hpd.put("TEACHER_ID", homework.getTEACHER_ID()); + hpd.put("COMPLETE_DESC", ""); + + for(HomeClass homeclass : homework.getCLASSLIST()){ + hpd.put("CLASS_ID", homeclass.getCLASS_ID()); + hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE()); + hpd.put("HOMEWORK_ID", this.get32UUID()); + homeworkService.save(hpd); + } + + for(HomeworkQuestion homeworkQuestion:homework.getQUESTIOMS()){ + PageData qpd = new PageData(); + qpd.put("RANK", homeworkQuestion.getRANK()); + qpd.put("CODE", hpd.get("CODE")); + qpd.put("NAME", homeworkQuestion.getNAME()); + qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM()); + qpd.put("SCORE", homeworkQuestion.getSCORE()); + qpd.put("RIGHT_ANSWER", homeworkQuestion.getRIGHT_ANSWER()); + qpd.put("TYPE", homeworkQuestion.getTYPE()); + qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID()); + qpd.put("HOMEWORK_ID", hpd.get("CODE")); + homeworkproblemService.save(qpd); + } + + responseGson.setData(pd.getString("CODE")); + return responseGson.toJson(); + } }