课后练bug修复

孙向锦
1 parent 0786f023
Showing 8 changed files with 66 additions and 11 deletions
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
resources/mybatis1/sunvote/CourseManagementMapper.xml
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
@@ -57,17 +57,17 @@
 								</td>
 							</tr>
  
-							<tr>
+							<%-- <tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
 								<td>
-								<%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%>
+								<input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td>
 								<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入班级类型">
 									<c:forEach var="item" items="${subjects}">
 										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
 									</c:forEach>
 								</select>
 								</td>
-							</tr>
+							</tr> --%>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">学期:</td>
 								<td>
@@ -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();
@@ -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();
@@ -101,6 +101,20 @@
 			ID = #{ID}
 	</select>
  
+	<select id="findByCourse" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			1 =1 
+			and TEACHER_ID  = #{TEACHER_ID} 
+			and CLASS_ID= #{TEACHER_ID} 	
+			and SUBJECT_ID= #{TEACHER_ID} 	
+			
+			limit 0,1
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
@@ -161,7 +175,14 @@
 			sv_coursemanagement
 		LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
 		WHERE
-			sv_coursemanagement.TEACHER_ID =  #{TEACHER_ID}
+		    1 = 1 
+		    <if test="TEACHER_ID != null and TEACHER_ID != ''">
+				and sv_coursemanagement.TEACHER_ID =  #{TEACHER_ID}
+			</if>
+		    <if test="SCHOOL_ID != null and SCHOOL_ID != ''">
+				and sv_coursemanagement.SCHOOL_ID =  #{SCHOOL_ID}
+			</if>
+		group by sv_sclass.CLASS_CODE
 		order by sv_sclass.CLASS_CODE
  
 	</select>
@@ -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;
@@ -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<String> responseGson = new ResponseGson<String>();
  
 		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()) {
@@ -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
@@ -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