Commit 17715043feb55460402d1a991a74051f99cd6812
1 parent
d9b2b420
1.修复可重复任课bug
2.修改文案
Showing
3 changed files
with
8 additions
and
5 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
@@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
100 | ${myelfun:findClassName(var.class_id)} | 100 | ${myelfun:findClassName(var.class_id)} |
101 | </c:if> | 101 | </c:if> |
102 | <c:if test="${empty var.class_id }"> | 102 | <c:if test="${empty var.class_id }"> |
103 | - 年级平均 | 103 | + 班级平均 |
104 | </c:if> | 104 | </c:if> |
105 | </td> | 105 | </td> |
106 | <td > | 106 | <td > |
resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -119,8 +119,8 @@ | @@ -119,8 +119,8 @@ | ||
119 | where | 119 | where |
120 | 1 =1 | 120 | 1 =1 |
121 | and TEACHER_ID = #{TEACHER_ID} | 121 | and TEACHER_ID = #{TEACHER_ID} |
122 | - and CLASS_ID= #{TEACHER_ID} | ||
123 | - and SUBJECT_ID= #{TEACHER_ID} | 122 | + and CLASS_ID= #{CLASS_ID} |
123 | + <!-- and SUBJECT_ID= #{SUBJECT_ID} --> | ||
124 | 124 | ||
125 | limit 0,1 | 125 | limit 0,1 |
126 | </select> | 126 | </select> |
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -96,11 +96,14 @@ public class CourseManagementController extends BaseController { | @@ -96,11 +96,14 @@ public class CourseManagementController extends BaseController { | ||
96 | pd.put("SUBJECT_ID", tpd.get("SUBJECT_IDS")); | 96 | pd.put("SUBJECT_ID", tpd.get("SUBJECT_IDS")); |
97 | if(coursemanagementService.findByCourse(pd) == null){ | 97 | if(coursemanagementService.findByCourse(pd) == null){ |
98 | coursemanagementService.save(pd); | 98 | coursemanagementService.save(pd); |
99 | + mv.addObject("msg","success"); | ||
100 | + mv.setViewName("save_result2"); | ||
99 | }else{ | 101 | }else{ |
100 | //TODO | 102 | //TODO |
103 | + mv.addObject("msg","不能重复任课,请检查后再试"); | ||
104 | + mv.setViewName("save_result2"); | ||
101 | } | 105 | } |
102 | - mv.addObject("msg","success"); | ||
103 | - mv.setViewName("save_result2"); | 106 | + |
104 | return mv; | 107 | return mv; |
105 | } | 108 | } |
106 | 109 |