Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

jack
2 parents e7fce508 76263c7c
Showing 8 changed files with 107 additions and 18 deletions
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp
resources/mybatis1/sunvote/HeadmasterMapper.xml
resources/mybatis1/sunvote/HomeworkMapper.xml
src/com/fh/controller/sunvote/headmaster/HeadmasterController.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/service/sunvote/headmaster/HeadmasterManager.java
src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java
@@ -31,6 +31,8 @@
 					<form action="headmaster/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="HEADMASTER_ID" id="HEADMASTER_ID" value="${pd.HEADMASTER_ID}"/>
+						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
+						<input type="hidden" name="PERMISSON" id="PERMISSON" value="${pd.PERMISSON}"/>
 						<div id="zhongxin" style="padding-top: 13px;">
 						<table id="table_report" class="table">
 							<tr>
@@ -89,7 +89,7 @@
 								<td class='center'>${var.PASSWORD}</td>								
 								<td class='center'>${var.PHONE}</td>
 								<td class='center'>${var.CLASS_NAME}</td>
-								<td><a onclick="edit('${var.HEADMASTER_ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a href="#" onclick="del('${var.HEADMASTER_ID}');"><img src="static/images/remove.png" /></a></td>								
+								<td><a onclick="edit('${var.HEADMASTER_ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.HEADMASTER_ID}');"><img src="static/images/remove.png" /></a></td>								
 							</tr>
 						</c:forEach>
@@ -150,12 +150,38 @@
 			});
 			window.top.modal.show();
 		}
-		$(function() {
-
-		
-		
-		
-		})
+		function del(Id){
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var str = Id;
+					if(str == ''){
+						for(var i=0;i < document.getElementsByName('ids').length;i++){
+						  if(document.getElementsByName('ids')[i].checked){
+						  	if(str=='') str += document.getElementsByName('ids')[i].value;
+						  	else str += ',' + document.getElementsByName('ids')[i].value;
+						  }
+						}
+					}
+					
+					$.ajax({
+							type: "POST",
+							url: '<%=basePath%>headmaster/deleteAll.do?tm='+new Date().getTime(),
+					    	data: {DATA_IDS:str},
+							dataType:'json',
+							//beforeSend: validateData,
+							cache: false,
+							success: function(data){
+								tosearch();
+							}
+						});
+					
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
 	</script>
@@ -172,6 +172,15 @@
 		 		ID = #{ID}
 	</update>
+	<update id="deleteCLassHeaderMaster" parameterType="pd">
+		update
+			sv_sclass
+		set 
+			HEADMASTER_ID = NULL
+		where 
+		 		HEADMASTER_ID = #{HEADMASTER_ID}
+	</update>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
@@ -184,5 +193,17 @@
 		</foreach>
 	</delete>
+	<update id="deleteAllCLassHeaderMaster" parameterType="String">
+		update
+			sv_sclass
+		set 
+			HEADMASTER_ID = NULL
+		where 
+		 		HEADMASTER_ID in 
+ 		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+               #{item}
+		</foreach>
+	</update>
+	
 	<!-- fh313596790qq(青苔) -->
 </mapper>
 \ No newline at end of file
@@ -286,7 +286,10 @@
 	<select id="report" parameterType="pd" resultType="pd">
 		SELECT
-				*
+				sv_homeworkreport.STUDENT_ID,
+				sv_homework.GET_SCORE as PAPER_SCORE,
+				sv_homework.HOMEWORK_ID,
+				sv_homeworkreport.GET_SCORE as STUDENT_SCORE
 		FROM
 			sv_homework
 		LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
@@ -301,7 +304,6 @@
 			<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
 				and COMPLETE_DATE &lt; #{END_DATE}
 			</if>
-			and sv_homework.COMPLETE_COUNT > 0
 			ORDER BY sv_homework.COMPLETE_DATE ,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
 	</select>
@@ -47,7 +47,6 @@ public class HeadmasterController extends BaseController {
 	@RequestMapping(value="/save")
 	public ModelAndView save() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"新增Headmaster");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -86,7 +85,6 @@ public class HeadmasterController extends BaseController {
 	@RequestMapping(value="/delete")
 	public void delete(PrintWriter out) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"删除Headmaster");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		headmasterService.delete(pd);
@@ -101,7 +99,6 @@ public class HeadmasterController extends BaseController {
 	@RequestMapping(value="/edit")
 	public ModelAndView edit() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"修改Headmaster");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -110,6 +107,21 @@ public class HeadmasterController extends BaseController {
 		mv.setViewName("save_result");
 		return mv;
 	}
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit2")
+	public ModelAndView edit2() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"修改Headmaster");
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		headmasterService.edit(pd);
+		mv.addObject("msg","success");
+		mv.setViewName("save_result2");
+		return mv;
+	}
 	/**列表
 	 * @param page
@@ -118,7 +130,6 @@ public class HeadmasterController extends BaseController {
 	@RequestMapping(value="/list")
 	public ModelAndView list(Page page) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"列表Headmaster");
-		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -222,7 +233,7 @@ public class HeadmasterController extends BaseController {
 		classes.add(classPageData);
 		mv.addObject("classes",classes);
 		mv.setViewName("sunvote/headmaster/headmaster_edit2");
-		mv.addObject("msg", "edit");
+		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);
 		return mv;
 	}	
@@ -235,7 +246,6 @@ public class HeadmasterController extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"批量删除Headmaster");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
 		PageData pd = new PageData();		
 		Map<String,Object> map = new HashMap<String,Object>();
 		pd = this.getPageData();
@@ -244,6 +254,7 @@ public class HeadmasterController extends BaseController {
 		if(null != DATA_IDS && !"".equals(DATA_IDS)){
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
 			headmasterService.deleteAll(ArrayDATA_IDS);
+			headmasterService.deleteAllCLassHeaderMaster(ArrayDATA_IDS);
 			pd.put("msg", "ok");
 		}else{
 			pd.put("msg", "no");
@@ -260,7 +271,6 @@ public class HeadmasterController extends BaseController {
 	@RequestMapping(value="/excel")
 	public ModelAndView exportExcel() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"导出Headmaster到excel");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -309,11 +309,25 @@ public class HomeworkController extends BaseController {
 		List<PageData> homeworkList = homeworkService.listAll(pd);
 		List<PageData> dataList = homeworkService.report(pd);
 		for(PageData stuPd:studentList){
+			double all = 0 ;
+			double get = 0;
 			for(PageData dpd : dataList){
 				if(dpd.get("STUDENT_ID").equals(stuPd.get("ID"))){
-					stuPd.put(dpd.get("HOMEWORK_ID"), dpd.get("GET_SCORE"));
+					stuPd.put(dpd.get("HOMEWORK_ID"), dpd.get("STUDENT_SCORE"));
+					try{
+						get += Double.parseDouble(dpd.get("STUDENT_SCORE").toString());
+					}catch(Exception ex){
+						
+					}
+					try{
+						all += Double.parseDouble(dpd.get("PAPER_SCORE").toString());
+					}catch(Exception ex){
+						
+					}
 				}
 			}
+			stuPd.put("STUDENT_ALL_SCORE", get);
+			stuPd.put("PAPER_ALL_SCORE", all);
 			stuPd.remove("SCHOOL_ID");
 			stuPd.remove("SEX");
 			stuPd.remove("CLASS_ID");
@@ -338,7 +352,7 @@ public class HomeworkController extends BaseController {
 		}
 		data.put("HOMEWORKS", homeworkList);// 
 		data.put("STUDENTS", studentList);
-		
+		pd.remove("JSON");
 		pd.put("DATA", data);
 		mv.setViewName("sunvote/homework/homework_report");
 		mv.addObject("pd", pd);
@@ -81,5 +81,11 @@ public interface HeadmasterManager{
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAllCLassHeaderMaster(String[] ArrayDATA_IDS)throws Exception;
+	
 }
@@ -88,6 +88,14 @@ public class HeadmasterService implements HeadmasterManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("HeadmasterMapper.deleteAll", ArrayDATA_IDS);
 	}
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAllCLassHeaderMaster(String[] ArrayDATA_IDS)throws Exception{
+		dao.update("HeadmasterMapper.deleteAllCLassHeaderMaster", ArrayDATA_IDS);
+	}
 	@Override