孙向锦 / SunvoteEducation

Commit 17715043feb55460402d1a991a74051f99cd6812

Authored by jack
1 parent d9b2b420

1.修复可重复任课bug 

2.修改文案
Inline Side-by-side
Showing 3 changed files with 8 additions and 5 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
  View file @1771504
... ... @@ -100,7 +100,7 @@
100 100 ${myelfun:findClassName(var.class_id)}
101 101 </c:if>
102 102 <c:if test="${empty var.class_id }">
103   - 年级平均
  103 + 班级平均
104 104 </c:if>
105 105 </td>
106 106 <td >
... ...
resources/mybatis1/sunvote/CourseManagementMapper.xml
  View file @1771504
... ... @@ -119,8 +119,8 @@
119 119 where
120 120 1 =1
121 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 125 limit 0,1
126 126 </select>
... ...
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
  View file @1771504
... ... @@ -96,11 +96,14 @@ public class CourseManagementController extends BaseController {
96 96 pd.put("SUBJECT_ID", tpd.get("SUBJECT_IDS"));
97 97 if(coursemanagementService.findByCourse(pd) == null){
98 98 coursemanagementService.save(pd);
  99 + mv.addObject("msg","success");
  100 + mv.setViewName("save_result2");
99 101 }else{
100 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 107 return mv;
105 108 }
106 109  
... ...