+
@@ -160,8 +140,7 @@
${academy.name } |
<%--
${user.id} | --%>
-
-
+
更新
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 8fe2033fde705c8b260874adbc425557978061cd..9d6f180fbac61e0f8d7244a9dfbdc900af0a5b9b 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1 +1,23 @@
-/cn/
+*.class
+.classpath
+.project
+/build/
+
+
+/target/
+
+# Java class files
+*.class
+
+# Generated files
+/bin/
+/gen/
+/out/
+
+# Log Files
+*.log
+
+
+# Intellij
+*.iml
+
diff --git a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java
index 027421cc4386bdb89b755b1f38a0c1242591d4ba..a61b9c7522c3a9dbabf60bf9bc71a1a40f311bc7 100644
--- a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java
+++ b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java
@@ -53,9 +53,11 @@ public class CourseController {
@RequestMapping("/QueryCourse.action")
public ModelAndView QueryCourse(@RequestParam(value = "currentPage",required=false, defaultValue="1")
- Integer currentPage,@RequestParam(value= "course",required=false)Course course){
+ Integer currentPage, /* @RequestParam(value= "course",required=false) */Course course){
+ System.out.println(course);
List list = courseService.selectCourses(currentPage,course);
List academies = academyService.selectAllAcademy();
+ List specialities = specialityService.selectAllSpeciality();
PageInfo page = new PageInfo(list);
Long specialityid = 0L;
@@ -72,6 +74,7 @@ public class CourseController {
modelAndView.addObject("pageInfo", page);
modelAndView.addObject("specialityid", specialityid);
modelAndView.addObject("academies", academies);
+ modelAndView.addObject("specialities", specialities);
modelAndView.addObject("page_url", "/CurriculumSystemManager/CourseController/QueryCourse.action");
return modelAndView;
diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Course.java b/src/cn/edu/hrbcu/curriculum/pojo/Course.java
index 2f9ddad351295c4449960862d39b5f6269f22d5a..05281df2d635f18f70051766702ff03e17934377 100644
--- a/src/cn/edu/hrbcu/curriculum/pojo/Course.java
+++ b/src/cn/edu/hrbcu/curriculum/pojo/Course.java
@@ -3,7 +3,15 @@ package cn.edu.hrbcu.curriculum.pojo;
import java.io.Serializable;
public class Course implements Serializable {
- private Long id;
+ @Override
+ public String toString() {
+ return "Course [id=" + id + ", name=" + name + ", identifier=" + identifier + ", theoretical=" + theoretical
+ + ", experiement=" + experiement + ", score=" + score + ", academyid=" + academyid + ", coursemodeid="
+ + coursemodeid + ", coursetypeid=" + coursetypeid + ", specialityid=" + specialityid
+ + ", teachingmethodid=" + teachingmethodid + ", examinationmethodid=" + examinationmethodid + "]";
+ }
+
+ private Long id;
private String name;
diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java
index 1084616cfe253932dbac92208b9be17386324c64..a989e80bf6fbe5197f25cc1eea3662d0533a92a5 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java
@@ -1,5 +1,6 @@
package cn.edu.hrbcu.curriculum.service;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
@@ -42,7 +43,7 @@ public class CourseServiceImpl implements CourseService {
CourseExample.Criteria criteria = example.createCriteria();
criteria.andIdGreaterThan(0L);
if(course != null) {
- if(course.getName() != null) {
+ if(course.getName() != null && StringUtils.isNotEmpty(course.getName())) {
criteria.andNameEqualTo(course.getName());
}
if(course.getAcademyid() != null) {
@@ -54,6 +55,9 @@ public class CourseServiceImpl implements CourseService {
if(course.getCoursetypeid() != null) {
criteria.andCoursetypeidEqualTo(course.getCoursetypeid());
}
+ if(course.getScore() != null) {
+ criteria.andScoreEqualTo(course.getScore() );
+ }
}
List list = courseMapper.selectByExample(example);
return list;
|