1.bug修复

jack
1 parent d35847df
Showing 10 changed files with 266 additions and 22 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
resources/mybatis1/sunvote/CourseManagementMapper.xml
src/com/fh/controller/sunvote/report/ReportController.java
src/com/fh/controller/sunvote/student/StudentController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
src/com/fh/util/ObjectExcelView.java
@@ -40,7 +40,7 @@
 		<div class="box_header">
 			<div class="head_box_l">
 				<p>
-					<span class="right_b"></span>试卷管理
+					<span class="right_b"></span>个人试卷管理
 				</p>
 			</div>
 			<div class="head_box_r">
@@ -107,7 +107,7 @@
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
 								<td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
-								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
+								<td ><a  target="_blank" style="display: inline-block;width: 100px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}" title="${var.TITLE}">${var.TITLE}</a></td>
 								<!--<td >${myelfun:findGradeName(var.GRADE_ID)}</td>-->
 								<td >${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
 								<td >${myelfun:findTeacherName(var.USER_ID)}</td>
@@ -40,7 +40,7 @@
 		<div class="box_header">
 			<div class="head_box_l">
 				<p>
-					<span class="right_b"></span>试卷管理
+					<span class="right_b"></span>年级试卷管理
 				</p>
 			</div>
 			<div class="head_box_r">
@@ -92,7 +92,7 @@
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
 								<td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
-								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
+								<td ><a  target="_blank" style="display: inline-block;width: 100px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}" title="${var.TITLE}">${var.TITLE}</a></td>
 								<td >${var.CREATE_DATE}</td>
 								<td >${myelfun:findGradeName(var.GRADE_ID)}</td>
 								<td >${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
@@ -66,6 +66,10 @@
 						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
 							id="nav-search-icon" style="line-height:20px"
 							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
+					<td style="padding-left:2px">
+						<a style="height:30px;width:3em"
+						class="btn btn-light btn-xs" onclick="export2();" title="导出">导出</a>
+					</td>
 				</tr>
 			</table>
 			<table id="simple-table"
@@ -273,6 +277,9 @@
 			window.self.location.href = url;
 			window.top.loading.show();
 		}
+		function export2(){
+			window.open("<%=basePath%>report/export2?CLASSID=${info.CLASS_ID}&ROLE=${pd.ROLE}","_blank");
+		}
 		$(document).ready(function(){
 			window.top.loading.remove();
@@ -101,6 +101,16 @@
 			ID = #{ID}
 	</select>
+	<!-- 通过TID获取数据 -->
+	<select id="findByTid" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			TEACHER_ID = #{TEACHER_ID}
+	</select>
+	
 	<select id="findByCourse" parameterType="pd" resultType="pd">
 		select 
 		<include refid="Field"></include>
@@ -4,7 +4,9 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Resource;
@@ -24,6 +26,7 @@ import com.fh.service.sunvote.teacher.TeacherManager;
 import com.fh.service.sunvote.testpaper.TestPaperManager;
 import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
 import com.fh.util.Jurisdiction;
+import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
 @Controller
@@ -542,4 +545,198 @@ public class ReportController extends BaseController {
 		return mv;
 	}
+	@RequestMapping(value="/export2")
+	public ModelAndView export2() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"班级报表");
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = getPageData();
+		pd.put("SCLASS_ID", pd.get("CLASSID"));
+		pd.put("ID", pd.get("CLASSID"));
+		pd.put("TEST_TYPE", "1");
+		String role = pd.getString("ROLE");
+		if( role != null && "admin".equals(role)){
+			PageData tpd = new PageData();
+			tpd.put("ID", getUserID());
+			PageData adminInfos = v1Service.getAdminInfo(tpd);
+			List<PageData> subjectInfos = new ArrayList<PageData>();
+			mv.addObject("subjectInfos", subjectInfos);
+		}else{
+			pd.put("TEACHER_ID", getUserID());
+		}
+		// 1 查询班级信息
+		PageData classPageData = sclassService.findById(pd);
+		PageData info = new PageData();
+		info.put("CLASS_NAME", classPageData.getString("CLASS_NAME"));
+		info.put("CLASS_CODE", classPageData.getString("CLASS_CODE"));
+		info.put("CLASS_ID", classPageData.getString("ID"));
+		pd.put("CLASS_ID", pd.get("CLASSID"));
+		// 2查询班级考试
+		pd.put("TEST_TYPE", "1");
+		// modify 根據班級查詢班級報表
+		List<PageData> reportData = v1Service.classReport(pd);
+		List<PageData> testpaperList = new ArrayList();
+		List<PageData> studentList = new ArrayList();
+		PageData studentPd = null;
+		double totalScore = 0 ;
+		double getScore = 0 ;
+		for(PageData item : reportData){
+			
+			// 学生列表
+			if(studentPd != null && item.get("STUDENT_ID").equals(studentPd.get("STUDENT_ID"))){
+				//
+				String score = item.getString("SCORE");
+				if(!"0".equals(score)){
+					studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
+				}else{
+					studentPd.put(item.get("TEST_ID"), "--");
+				}
+				String totalScoreStr = item.getString("TOTAL_SCORE");
+				if(totalScoreStr != null){
+					try{
+						totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				if(score != null){
+					try{
+						getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+			}else{
+				if(studentPd != null){
+					studentPd.put("TOTALSCORE", totalScore);
+					studentPd.put("GETSCORE", getScore);
+					studentList.add(studentPd);
+					totalScore = 0 ;
+					getScore = 0 ;
+				}
+				studentPd = new PageData();
+				studentPd.put("STUDENT_ID", item.get("STUDENT_ID"));
+				studentPd.put("NAME", item.get("NAME"));
+				String score = item.getString("SCORE");
+				if(!"0".equals(score)){
+					studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
+				}else{
+					studentPd.put(item.get("TEST_ID"), "--");
+				}
+				String totalScoreStr = item.getString("TOTAL_SCORE");
+				if(totalScoreStr != null){
+					try{
+						totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				if(score != null){
+					try{
+						getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				
+			}
+			PageData clone = new PageData(item);
+			// 试卷列表
+			if(!contain(testpaperList, clone, "TEST_ID")){
+				clone.put("TESTPAPER_ID", clone.get("TEST_ID"));
+				clone.put("NAME", clone.get("PAPER_NAME"));
+				testpaperList.add(clone);
+			}
+			
+		}
+		if(studentPd != null){
+			studentPd.put("TOTALSCORE", totalScore);
+			studentPd.put("GETSCORE", getScore);
+			studentList.add(studentPd);
+			totalScore = 0 ;
+			getScore = 0 ;
+		}
+		
+		Collections.sort(testpaperList,new Comparator<PageData>(){
+
+			@Override
+			public int compare(PageData o1, PageData o2) {
+				String o1GetScore = o1.getString("CREATE_DATE");
+				String o2GetScore = o2.getString("CREATE_DATE");
+				return - o1GetScore.compareToIgnoreCase(o2GetScore);
+			}
+			
+		});
+		
+		mv.addObject("testpaperList", testpaperList);
+		info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
+		
+		mv.addObject("studentList", studentList);
+		info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
+		mv.addObject("info", info);
+		mv.addObject("start_date", pd.get("START_DATE"));
+		mv.addObject("end_date", pd.get("END_DATE"));
+		mv.addObject("pd", pd);
+		
+		Map<String,Object> dataMap = new HashMap<String,Object>();
+		List<String> titles = new ArrayList<String>();
+		titles.add("姓名");	//1
+		titles.add("课程平均得分率");	//2
+		titles.add("课程总分");	//3
+		
+		for(PageData item : testpaperList){
+			titles.add(item.get("NAME").toString().concat(item.get("CREATE_DATE").toString()));
+		}
+		dataMap.put("titles", titles);
+		dataMap.put("class",classPageData.get("CLASS_NAME"));
+
+		List<PageData> varList = new ArrayList<PageData>();
+		for(int x= 0 ;x<studentList.size()+3;x++){
+			
+				PageData vpd = new PageData();
+				if(x<3){
+					if(x==0)
+						vpd.put("var1", "班级课程总分");
+					else if(x==1)
+						vpd.put("var1", "班级课程平均分");
+					else
+						vpd.put("var1", "班级课程平均得分率");
+					vpd.put("var2", "");
+					vpd.put("var3", "");
+				}else{
+					vpd.put("var1", studentList.get(x-3).getString("NAME"));
+					vpd.put("var2", studentList.get(x-3).getString("TOTALSCORE").toString() == "0" ? "0" : ( Float.parseFloat(studentList.get(x-3).getString("GETSCORE"))  / Float.parseFloat(studentList.get(x-3).getString("TOTALSCORE"))  * 100));
+					vpd.put("var3", studentList.get(x-3).getString("GETSCORE"));
+				}
+				
+				for(int j=0;j<testpaperList.size();j++){
+					if(x<3){
+						if(x==0)
+							vpd.put("var"+(j+4), testpaperList.get(j).getString("TOTAL_SCORE"));
+						else if(x==1)
+							vpd.put("var"+(j+4), testpaperList.get(j).getString("AVG_SCORE"));
+						else
+							vpd.put("var"+(j+4), testpaperList.get(j).getString("TOTAL_SCORE")=="0"?"0": Float.parseFloat(testpaperList.get(j).getString("AVG_SCORE"))  / Float.parseFloat(testpaperList.get(j).getString("TOTAL_SCORE"))  * 100);
+						
+					}else{
+						vpd.put("var"+(j+4), studentList.get(x-3).getString(testpaperList.get(j).getString("TESTPAPER_ID")));
+					}
+				}
+				varList.add(vpd);
+			
+		}
+		
+		dataMap.put("varList", varList);
+		ObjectExcelView erv = new ObjectExcelView();
+		mv = new ModelAndView(erv,dataMap);
+//		if(isChineseLanguageClient()){
+//			mv.setViewName("sunvote/teacher/teacher_report_1");
+//		}else{
+//			mv.setViewName("sunvote/teacher/en_teacher_report_1");
+//		}
+		
+		return mv;
+	}
+	
+	
+	
 }
@@ -405,11 +405,11 @@ public class StudentController extends BaseController {
 		List<PageData> varList = new ArrayList<PageData>();
 		for(int i=0;i<varOList.size();i++){
 			PageData vpd = new PageData();
-			vpd.put("var1", varOList.get(i).getString("NAME"));
-			vpd.put("var2", varOList.get(i).getString("NUMBER"));
-			vpd.put("var3", varOList.get(i).getString("KEYPAD_ID"));
-			vpd.put("var5", varOList.get(i).getString("GRADE_NAME"));
-			vpd.put("var4", varOList.get(i).getString("CLASS_NAME"));
+			vpd.put("var1", varOList.get(i).getString("NAME")==null?"":varOList.get(i).getString("NAME"));
+			vpd.put("var2", varOList.get(i).getString("NUMBER")==null?"":varOList.get(i).getString("NUMBER"));
+			vpd.put("var3", varOList.get(i).getString("KEYPAD_ID")==null?"":varOList.get(i).getString("KEYPAD_ID"));
+			vpd.put("var4", varOList.get(i).getString("GRADE_NAME")==null?"":varOList.get(i).getString("GRADE_NAME"));
+			vpd.put("var5", varOList.get(i).getString("CLASS_NAME")==null?"":varOList.get(i).getString("CLASS_NAME"));
 //			vpd.put("var1", varOList.get(i).getString("NAME"));	    //1
 //			vpd.put("var2", varOList.get(i).getString("SNO"));	    //2
@@ -26,6 +26,7 @@ import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.service.api.V1Manager;
+import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
 import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.subject.SubjectManager;
 import com.fh.service.sunvote.teacher.TeacherManager;
@@ -67,6 +68,9 @@ public class TeacherController extends BaseController {
 	@Resource(name="subjectService")
 	private SubjectManager subjectService;
+	@Resource(name="coursemanagementService")
+	private CourseManagementManager coursemanagementService;
+	
 	/**
 	 * 保存
 	 * 
@@ -216,6 +220,12 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		PageData n = teacherService.findById(pd);
+		PageData temp = new PageData();
+		temp.put("TEACHER_ID",n.get("ID").toString());
+		PageData p = coursemanagementService.findByTid(temp);
+		pd.put("PASSWORD",
+				new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
+						.getString("PASSWORD")).toString()); // 密码加密
 		teacherService.edit(pd);
 		pd.put("USER_ID", pd.getString("ID")); // ID 主键
 		pd.put("LAST_LOGIN", ""); // 最后登录时间
@@ -225,10 +235,10 @@ public class TeacherController extends BaseController {
 		pd.put("RIGHTS", "");
 		pd.put("USERNAME", n.getString("ACCOUT"));
 		pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
-		pd.put("PASSWORD",
-				new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
-						.getString("PASSWORD")).toString()); // 密码加密
+		
 		userService.editU(pd); // 执行保存
+		p.put("SUBJECT_ID", pd.get("SUBJECT_IDS"));
+		coursemanagementService.edit(p);
 		mv.addObject("msg", "success");
 		mv.setViewName("save_result2");
 		return mv;
@@ -833,15 +843,15 @@ public class TeacherController extends BaseController {
 		for (int i = 0; i < varOList.size(); i++) {
 			PageData vpd = new PageData();
 			vpd.put("var1", varOList.get(i).get("SCHOOL_NAME").toString()); // 1
-			vpd.put("var2", varOList.get(i).getString("NAME")); // 2
-			vpd.put("var3", varOList.get(i).getString("PHONE")); // 3
-			vpd.put("var4", varOList.get(i).getString("SEAT_PHONE")); // 4
-			vpd.put("var5", varOList.get(i).getString("CARD_NO")); // 5
-			vpd.put("var6", varOList.get(i).getString("ACCOUT")); // 6
-			vpd.put("var7", varOList.get(i).getString("PASSWORD")); // 7
-			vpd.put("var8", varOList.get(i).get("SEX").toString().equals("1")?"男":"女"); // 8
-			vpd.put("var9", varOList.get(i).getString("CNAME")); // 9
-			vpd.put("var10", varOList.get(i).getString("KEYPAD_ID")); // 10
+			vpd.put("var2", varOList.get(i).getString("NAME")==null?"":varOList.get(i).getString("NAME")); // 2
+			vpd.put("var3", varOList.get(i).getString("PHONE")==null?"":varOList.get(i).getString("PHONE")); // 3
+			vpd.put("var4", varOList.get(i).getString("SEAT_PHONE")==null?"":varOList.get(i).getString("SEAT_PHONE")); // 4
+			vpd.put("var5", varOList.get(i).getString("CARD_NO")==null?"":varOList.get(i).getString("CARD_NO")); // 5
+			vpd.put("var6", varOList.get(i).getString("ACCOUT")==null?"":varOList.get(i).getString("ACCOUT")); // 6
+			vpd.put("var7", varOList.get(i).getString("PASSWORD")==null?"":varOList.get(i).getString("PASSWORD")); // 7
+			vpd.put("var8", varOList.get(i).get("SEX")==null?"":varOList.get(i).get("SEX").toString().equals("1")?"男":"女"); // 8
+			vpd.put("var9", varOList.get(i).getString("CNAME")==null?"":varOList.get(i).getString("CNAME")); // 9
+			vpd.put("var10", varOList.get(i).getString("KEYPAD_ID")==null?"":varOList.get(i).getString("KEYPAD_ID")); // 10
 			varList.add(vpd);
 		}
 		dataMap.put("varList", varList);
@@ -48,6 +48,13 @@ public interface CourseManagementManager{
 	 * @throws Exception
 	 */
 	public PageData findById(PageData pd)throws Exception;
+	
+	/**通过tid获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByTid(PageData pd)throws Exception;
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -89,6 +89,14 @@ public class CourseManagementService implements CourseManagementManager{
 	 * @param pd
 	 * @throws Exception
 	 */
+	public PageData findByTid(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("CourseManagementMapper.findByTid", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
 	public PageData findByCourse(PageData pd)throws Exception{
 		return (PageData)dao.findForObject("CourseManagementMapper.findByCourse", pd);
 	}
@@ -29,7 +29,12 @@ public class ObjectExcelView extends AbstractExcelView{
 		HSSFCell cell;
 		response.setContentType("application/octet-stream");
 		response.setHeader("Content-Disposition", "attachment;filename="+filename+".xls");
-		sheet = workbook.createSheet("sheet1");
+		if(model.get("class")!=null && !model.get("class").toString().isEmpty()){
+			sheet = workbook.createSheet(model.get("class").toString());
+		}else{
+			sheet = workbook.createSheet("sheet1");
+		}
+		
 		List<String> titles = (List<String>) model.get("titles");
 		int len = titles.size();