From 91ec7c27b2b2c320e2848e30bce4a6d31071bfc2 Mon Sep 17 00:00:00 2001 From: ChineseTony <13206573871@163.com> Date: Sat, 13 Apr 2019 22:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B7=BB=E5=8A=A0=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +- WebContent/jsp/AddCourse.jsp | 34 ++++++++++- WebContent/jsp/QueryCourse.jsp | 60 +++++++++++++++++-- WebContent/jsp/UpdateCourse.jsp | 30 +++++++++- .../controller/CourseController.java | 21 +++++-- .../controller/SpecialityController.java | 7 +++ .../curriculum/service/CourseService.java | 2 + .../curriculum/service/CourseServiceImpl.java | 27 +++++++++ .../curriculum/service/SpecialityService.java | 3 + .../service/SpecialityServiceImpl.java | 9 +++ 10 files changed, 186 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 2f24f9d..9d6f180 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ *.class .classpath .project -build/ +/build/ + + +/target/ # Java class files *.class diff --git a/WebContent/jsp/AddCourse.jsp b/WebContent/jsp/AddCourse.jsp index ea93712..0dac350 100644 --- a/WebContent/jsp/AddCourse.jsp +++ b/WebContent/jsp/AddCourse.jsp @@ -25,6 +25,22 @@ tiptype:3 }); + $('#academyid').change(function (academyid){ + var academyid = $('#academyid option:selected').val(); + + $.ajax({ + url : '<%=request.getContextPath() %>/SpecialityController/QueryAllSpecialityByAcademyid.action', + datatype : 'json', + data: { "academyid":academyid}, + success : function(specialities){ + $('#specialityid').empty(); + specialities.forEach(function(speciality){ + $('#specialityid').append(''); + }) + } + }); + }); + }); @@ -96,9 +112,23 @@ - + + +
+ +
+ +
+ +
+ +
@@ -138,7 +168,7 @@
diff --git a/WebContent/jsp/QueryCourse.jsp b/WebContent/jsp/QueryCourse.jsp index 9953e87..57e93fc 100644 --- a/WebContent/jsp/QueryCourse.jsp +++ b/WebContent/jsp/QueryCourse.jsp @@ -73,9 +73,59 @@
- +
- +
+
+

查询课程

+
+
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + + +
+
+ + +
+
+
+
+
@@ -113,8 +163,10 @@ - 更新 - 删除 + + 更新 + 删除 + diff --git a/WebContent/jsp/UpdateCourse.jsp b/WebContent/jsp/UpdateCourse.jsp index ecf45e3..26d4b58 100644 --- a/WebContent/jsp/UpdateCourse.jsp +++ b/WebContent/jsp/UpdateCourse.jsp @@ -24,6 +24,23 @@ tiptype:3 }); + $('#academyid').change(function (academyid){ + var academyid = $('#academyid option:selected').val(); + + $.ajax({ + url : '<%=request.getContextPath() %>/SpecialityController/QueryAllSpecialityByAcademyid.action', + datatype : 'json', + data: { "academyid":academyid}, + success : function(specialities){ + $('#specialityid').empty(); + specialities.forEach(function(speciality){ + $('#specialityid').append(''); + + }) + } + }); + }); + }); @@ -94,7 +111,18 @@
+
+
+ +
+ +
+
diff --git a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java index accacd9..027421c 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java @@ -52,15 +52,25 @@ public class CourseController { private TbUserService tbUserService; @RequestMapping("/QueryCourse.action") - public ModelAndView QueryCourse(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){ - List list = courseService.selectCourses(currentPage); + public ModelAndView QueryCourse(@RequestParam(value = "currentPage",required=false, defaultValue="1") + Integer currentPage,@RequestParam(value= "course",required=false)Course course){ + List list = courseService.selectCourses(currentPage,course); List academies = academyService.selectAllAcademy(); PageInfo page = new PageInfo(list); - + Long specialityid = 0L; + Subject subject = SecurityUtils.getSubject(); + List tbUsers = tbUserService.selectUserByLoginname((String) subject.getPrincipal()); + if (tbUsers != null && tbUsers.size() > 0) { + Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); + if(speciality != null) { + specialityid = speciality.getId(); + } + } ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("/QueryCourse"); modelAndView.addObject("pageInfo", page); + modelAndView.addObject("specialityid", specialityid); modelAndView.addObject("academies", academies); modelAndView.addObject("page_url", "/CurriculumSystemManager/CourseController/QueryCourse.action"); @@ -110,6 +120,7 @@ public class CourseController { @RequestMapping("/toAddCourse.action") public Object toAddCourse(){ List academies = academyService.selectAllAcademy(); + List specialities = specialityService.selectAllSpeciality(); List coursemodes = coursemodeService.selectAllCoursemode(); List coursetypes= coursetypeService.selectAllCoursetype(); List teachingmethods = teachingmethodService.selectAllTeachingmethod(); @@ -120,6 +131,7 @@ public class CourseController { modelAndView.addObject("coursemodes", coursemodes); modelAndView.addObject("coursetypes", coursetypes); modelAndView.addObject("teachingmethods", teachingmethods); + modelAndView.addObject("specialities", specialities); modelAndView.addObject("examinationmethods", examinationmethods); return modelAndView; @@ -132,7 +144,7 @@ public class CourseController { List coursetypes= coursetypeService.selectAllCoursetype(); List teachingmethods = teachingmethodService.selectAllTeachingmethod(); List examinationmethods = examinationmethodService.selectAllExaminationmethod(); - + List specialities = specialityService.selectAllSpeciality(); course = courseService.selectCourseById(course); ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("/UpdateCourse"); @@ -143,6 +155,7 @@ public class CourseController { modelAndView.addObject("coursetypes", coursetypes); modelAndView.addObject("teachingmethods", teachingmethods); modelAndView.addObject("examinationmethods", examinationmethods); + modelAndView.addObject("specialities", specialities); return modelAndView; } diff --git a/src/cn/edu/hrbcu/curriculum/controller/SpecialityController.java b/src/cn/edu/hrbcu/curriculum/controller/SpecialityController.java index 7f2ccaa..c033a1f 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/SpecialityController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/SpecialityController.java @@ -53,4 +53,11 @@ public class SpecialityController { return list; } + @RequestMapping("/QueryAllSpecialityByAcademyid.action") + @ResponseBody + public Object QueryAllSpecialityByAcademyid(@RequestParam("academyid")Long academyid){ + List list = specialityService.selectAllSpecialityByAcademyid(academyid); + return list; + } + } diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseService.java b/src/cn/edu/hrbcu/curriculum/service/CourseService.java index 3266308..3d3c100 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseService.java @@ -10,6 +10,8 @@ public interface CourseService { List selectAllCourse(); + List selectCourses(int i,Course course); + List selectCourses(int i); Course selectCourseById(Course course); diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java index a430ae9..1084616 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java @@ -33,6 +33,32 @@ public class CourseServiceImpl implements CourseService { } + public List selectCourses(int currentPage,Course course) { + if(currentPage >= 0){ + PageHelper.startPage(currentPage, Common.PAGE_SIZE); + } + // TODO Auto-generated method stub + CourseExample example = new CourseExample(); + CourseExample.Criteria criteria = example.createCriteria(); + criteria.andIdGreaterThan(0L); + if(course != null) { + if(course.getName() != null) { + criteria.andNameEqualTo(course.getName()); + } + if(course.getAcademyid() != null) { + criteria.andAcademyidEqualTo(course.getAcademyid()); + } + if(course.getSpecialityid() != null) { + criteria.andSpecialityidEqualTo(course.getSpecialityid()); + } + if(course.getCoursetypeid() != null) { + criteria.andCoursetypeidEqualTo(course.getCoursetypeid()); + } + } + List list = courseMapper.selectByExample(example); + return list; + } + public List selectCourses(int currentPage) { if(currentPage >= 0){ PageHelper.startPage(currentPage, Common.PAGE_SIZE); @@ -46,6 +72,7 @@ public class CourseServiceImpl implements CourseService { } + @Override public void deleteCourse(Course course) { diff --git a/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java b/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java index 2702cfc..f3ed052 100644 --- a/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java +++ b/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java @@ -17,6 +17,9 @@ public interface SpecialityService { List selectAllSpeciality(); + + List selectAllSpecialityByAcademyid(Long academyid); + Speciality selectSpecialityByUserId(Long userid); } diff --git a/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java index 230cf80..d227bad 100644 --- a/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java @@ -76,6 +76,15 @@ public class SpecialityServiceImpl implements SpecialityService{ return null; } + @Override + public List selectAllSpecialityByAcademyid(Long academyid) { + SpecialityExample example = new SpecialityExample(); + SpecialityExample.Criteria criteria = example.createCriteria(); + criteria.andAcademyidEqualTo(academyid); + + return specialityMapper.selectByExample(example); + } + } -- Gitee