From b3c44d84782afae591e1fad36c973600a59e9f0d Mon Sep 17 00:00:00 2001 From: Elvis Date: Thu, 18 Apr 2019 14:57:30 +0800 Subject: [PATCH] 课后练bug修复 --- WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp | 6 +++--- WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 2 +- resources/mybatis1/sunvote/CourseManagementMapper.xml | 23 ++++++++++++++++++++++- src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java | 10 +++++++++- src/com/fh/controller/sunvote/homework/HomeworkController.java | 21 +++++++++++++++++---- src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java | 5 +++++ src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java | 8 ++++++++ 8 files changed, 66 insertions(+), 11 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp index 6d2e096..6780029 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp @@ -57,17 +57,17 @@ - + <%-- 科目: - <%-- --%> + - + --%> 学期: diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp index e2b6e1d..256c115 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp @@ -282,7 +282,7 @@ } function homeReport(classId){ - var path = '<%=basePath%>homework/report.do?CLASS_ID='+classId; + var path = '<%=basePath%>homework/report.do?School_id=${pd.SCHOOL_ID}&CLASS_ID='+classId; console.log(path); parent.$("#mainFrame").attr('src',path); window.top.loading.show(); diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 92bce4e..f51d85c 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -197,7 +197,7 @@ function homeWorkList(schoolId){ //var path = "../school/goEdit2.do?ID=" + schoolId ; - var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ; + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ; $("#mainFrame").attr('src',path); window.top.loading.show(); diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml index 2d8e39e..43b46cf 100644 --- a/resources/mybatis1/sunvote/CourseManagementMapper.xml +++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml @@ -101,6 +101,20 @@ ID = #{ID} + + diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java index c6c1220..35b26c9 100644 --- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java +++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java @@ -90,7 +90,15 @@ public class CourseManagementController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("ID", this.get32UUID()); - coursemanagementService.save(pd); + PageData tpd = new PageData(); + tpd.put("ID", pd.get("TEACHER_ID")); + tpd = teacherService.findById(tpd); + pd.put("SUBJECT_ID", tpd.get("SUBJECT_IDS")); + if(coursemanagementService.findByCourse(pd) == null){ + coursemanagementService.save(pd); + }else{ + //TODO + } mv.addObject("msg","success"); mv.setViewName("save_result2"); return mv; diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 9dbee6b..89d8566 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -31,6 +31,8 @@ import com.fh.service.sunvote.homework.HomeworkManager; import com.fh.service.sunvote.homework.HomeworkReportManager; import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager; import com.fh.service.sunvote.student.StudentManager; +import com.fh.service.sunvote.teacher.TeacherManager; +import com.fh.service.sunvote.teacher.impl.TeacherService; import com.fh.util.AppUtil; import com.fh.util.Jurisdiction; import com.fh.util.ObjectExcelView; @@ -61,6 +63,9 @@ public class HomeworkController extends BaseController { @Resource(name="studentService") private StudentManager studentService; + + @Resource(name = "teacherService") + private TeacherManager teacherService; /** * 保存 @@ -125,10 +130,10 @@ public class HomeworkController extends BaseController { logBefore(logger, Jurisdiction.getUsername() + "列表Homework"); ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); - if(pd.get("TEACHER_ID") == null){ + pd = this.getPageData(); + if(pd.get("SCHOOL_ID") == null){ pd.put("TEACHER_ID", getTeacherID()); } - pd = this.getPageData(); String keywords = pd.getString("keywords"); // 关键词检索条件 if (null != keywords && !"".equals(keywords)) { pd.put("keywords", keywords.trim()); @@ -275,7 +280,9 @@ public class HomeworkController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("TEACHER_ID", getTeacherID()); + if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){ + pd.put("TEACHER_ID", getTeacherID()); + } if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){ @@ -707,6 +714,9 @@ public class HomeworkController extends BaseController { Homework homework = Homework.parse(data); + pd.put("ID", getTeacherID()); + PageData tmpd = teacherService.findById(pd); + PageData hpd = new PageData(); if (homework != null) { hpd.put("CODE", get32UUID()); @@ -726,6 +736,7 @@ public class HomeworkController extends BaseController { hpd.put("MODIFY_DATE", format.format(new Date())); hpd.put("COMPLETE_COUNT", 0); hpd.put("TEACHER_ID", homework.getTEACHER_ID()); + hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID")); hpd.put("COMPLETE_DESC", ""); if (homework.getCLASSLIST() != null @@ -774,7 +785,8 @@ public class HomeworkController extends BaseController { ResponseGson responseGson = new ResponseGson(); Homework homework = Homework.parse(data); - + pd.put("ID", getTeacherID()); + PageData tmpd = teacherService.findById(pd); PageData hpd = new PageData(); if (homework != null) { if (homework.getHOMEWORK_ID() != null @@ -792,6 +804,7 @@ public class HomeworkController extends BaseController { hpd.put("COMPLETE_COUNT", 0); hpd.put("TEACHER_ID", homework.getTEACHER_ID()); hpd.put("COMPLETE_DESC", ""); + hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID")); if(homeworkService.findByCode(hpd).size() > 1){ hpd.put("CODE", get32UUID()); for (HomeClass homeclass : homework.getCLASSLIST()) { diff --git a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java index 8f2fa5f..465a178 100644 --- a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java +++ b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java @@ -48,6 +48,11 @@ public interface CourseManagementManager{ * @throws Exception */ public PageData findById(PageData pd)throws Exception; + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCourse(PageData pd)throws Exception; /**批量删除 * @param ArrayDATA_IDS diff --git a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java index 15bdd20..26e299d 100644 --- a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java +++ b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java @@ -85,6 +85,14 @@ public class CourseManagementService implements CourseManagementManager{ return (PageData)dao.findForObject("CourseManagementMapper.findById", pd); } + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCourse(PageData pd)throws Exception{ + return (PageData)dao.findForObject("CourseManagementMapper.findByCourse", pd); + } + /**批量删除 * @param ArrayDATA_IDS * @throws Exception -- libgit2 0.21.4