From 58e024aeefe61a6112337937e5af46901d4b0df2 Mon Sep 17 00:00:00 2001
From: jack_rabbit <376168706@qq.com>
Date: Fri, 13 Dec 2019 17:22:03 +0800
Subject: [PATCH] 1.修改logo 2.添加按学生分析接口

---
 WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp                    |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp                |  2 +-
 WebRoot/WEB-INF/jsp/system/index/en_login.jsp                       |  2 ++
 WebRoot/WEB-INF/jsp/system/index/login.jsp                          |  8 +++++---
 WebRoot/static/images/logo.png                                      | Bin 3408 -> 0 bytes
 WebRoot/static/login/title.png                                      | Bin 30505 -> 0 bytes
 resources/mybatis1/sunvote/StudentTestMapper.xml                    | 23 +++++++++++++++++++++++
 src/com/fh/controller/base/BaseController.java                      | 13 ++++++++++++-
 src/com/fh/controller/sunvote/paper/PaperController.java            | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/studenttest/StudentTestManager.java      |  6 ++++++
 src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java |  8 ++++++++
 11 files changed, 104 insertions(+), 6 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index 6a32919..46a5df3 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -14,7 +14,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>鹿鸣周测管理系统</title>
+<title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
 <!-- <link
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index d25faf8..57deabd 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -14,7 +14,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>鹿鸣周测管理系统</title>
+<title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
 <link href="../static/css/bootstrap.min.css" rel="stylesheet">
diff --git a/WebRoot/WEB-INF/jsp/system/index/en_login.jsp b/WebRoot/WEB-INF/jsp/system/index/en_login.jsp
index 0d50617..1e34c80 100644
--- a/WebRoot/WEB-INF/jsp/system/index/en_login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/en_login.jsp
@@ -81,6 +81,8 @@ html,body{
 						<svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg>
 					</div>
 					<div class="psw_box">
+					<input type="text"  id="username1" placeholder="账号" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/>
+					<input type="password"  id="password1" placeholder="密   码" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/>
 						<input type="text"  id="password" placeholder="Password" value="" autoComplete="off"/>
 						<div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;">
 							<input type="checkbox" id="rem_flag"/>
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 41271bb..e847062 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -14,7 +14,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>鹿鸣周测管理系统</title>
+<title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
 <link href="static/css/bootstrap.min.css" rel="stylesheet">
@@ -80,17 +80,19 @@ body{
 						<svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg>
 					</div>
 					<div class="psw_box">
+					<input type="text"  id="username1" placeholder="账号" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/>
+					<input type="password"  id="password1" placeholder="密   码" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/>
 						<input type="text"  id="password" placeholder="密   码" value="" autoComplete="off"/>
 						<div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;">
 							<input type="checkbox" id="rem_flag"/>
 							<span>记住密码</span>
 						</div>
-						<!-- <div class="language" style="display:none;width:50%;margin-top:10px;text-align:right;">
+						<div class="language" style="display:inline-block;width:50%;margin-top:10px;text-align:right;">
 							<select name="language" id="language" style="line-height:34px;height:34px;width:120px;">
 								<option value="zh">中文</option>
 								<option value="en">English</option>
 							</select>
-						</div> -->
+						</div>
 					</div>
 					<a href="#" onclick="severCheck();" class="login_btn">登录</a>
 					
diff --git a/WebRoot/static/images/logo.png b/WebRoot/static/images/logo.png
index 5bf27a2..74104a4 100644
Binary files a/WebRoot/static/images/logo.png and b/WebRoot/static/images/logo.png differ
diff --git a/WebRoot/static/login/title.png b/WebRoot/static/login/title.png
index 4d1f8f0..7b35490 100644
Binary files a/WebRoot/static/login/title.png and b/WebRoot/static/login/title.png differ
diff --git a/resources/mybatis1/sunvote/StudentTestMapper.xml b/resources/mybatis1/sunvote/StudentTestMapper.xml
index 69268ad..330733f 100644
--- a/resources/mybatis1/sunvote/StudentTestMapper.xml
+++ b/resources/mybatis1/sunvote/StudentTestMapper.xml
@@ -87,6 +87,29 @@
 			STUDENTTEST_ID = #{STUDENTTEST_ID}
 	</select>
 	
+	<!-- 通过试卷ID获取数据 -->
+	<select id="findTestInfoByPid" parameterType="pd" resultType="pd">
+		select 
+			sv_studenttest.STUDENT_ID,
+			sv_studenttest.TEST_ID,
+			sv_studenttest.PAPER_ID as pid,
+			sv_studenttest.SCORE,
+			sv_studenttest.CLASS_ID,
+			sv_studenttest.LOST_TEST,
+		  	sv_testpaper.AVG_SCORE,
+			sv_testpaper.CREATE_DATE,
+			sv_testpaper.`NAME` AS PAPER_NAME,
+			sv_sclass.CLASS_NAME,
+			sv_student.`NAME` as STUDENT_NAME
+		from 
+			`sv_studenttest`
+			LEFT JOIN sv_testpaper ON sv_studenttest.TEST_ID = sv_testpaper.TESTPAPER_ID 
+			LEFT JOIN sv_sclass on sv_studenttest.CLASS_ID = sv_sclass.ID
+			LEFT JOIN sv_student on sv_studenttest.STUDENT_ID = sv_student.ID
+		where 
+			sv_studenttest.PAPER_ID = = #{PAPER_ID}
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java
index 510cc91..4088066 100644
--- a/src/com/fh/controller/base/BaseController.java
+++ b/src/com/fh/controller/base/BaseController.java
@@ -1,5 +1,7 @@
 package com.fh.controller.base;
 
+import java.util.List;
+
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -216,5 +218,14 @@ public class BaseController {
 		}
 		return "zh".equals(getLang());
 	}
-
+	
+	/**
+	 * 判断List中是否含有指定字符串
+	 */
+	public Integer indexOfStrInList(List<String> list,String str){
+		for(int i = 0 ;i<list.size();i++){
+			if(list.get(i).indexOf(str) !=-1 ) return list.get(i).indexOf(str);
+		}
+		return -1;
+	}
 }
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index f568c50..d7a43cf 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -643,6 +643,52 @@ public class PaperController extends BaseController {
 		return mv;
 	}
 	
+	/**
+	 * 按学生分析
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/paperRep3")
+	public ModelAndView paperRep3() throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		List<PageData> templist = new ArrayList<PageData>();
+		PageData saveData = new PageData();
+		
+		ResponseGson<PageData> res = new ResponseGson();
+		pd = this.getPageData();
+		if(pd.containsKey("PAPER_ID")){
+			List<PageData> list = studenttestService.findTestInfoByPid(pd);
+			List<PageData> temp = new ArrayList<PageData>();
+			List<String> sid = new ArrayList<String>();
+			for(PageData item : list){
+				
+				Integer index = this.indexOfStrInList(sid, item.getString("STUDENT_ID"));
+				if(index!=-1){
+					
+				}else{
+					PageData stu = new PageData();
+					stu.put("STUDENT_NAME", item.get("STUDENT_NAME"));
+					stu.put("CLASS_NAME", item.get("CLASS_NAME"));
+					List<PageData> test = new ArrayList<PageData>();
+					test.get(0).put("CREAT_DATE", item.get("CREAT_DATE"));
+					test.get(0).put("SCORE", item.get("SCORE"));
+					test.get(0).put("AVG_SCORE", item.get("AVG_SCORE"));
+					stu.put("TEST_LIST", test);
+					temp.add(stu);
+				}
+				
+				
+			}
+		}
+		mv.setViewName("sunvote/paper/test_list3");
+		mv.addObject("varList", templist);
+		mv.addObject("pd",pd);
+		res.setData(saveData);
+		return mv;
+	}
+	
+	
 	@RequestMapping(value="/iteminfo")
 	public ModelAndView iteminfo() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"Paper详细信息");
diff --git a/src/com/fh/service/sunvote/studenttest/StudentTestManager.java b/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
index e53913d..dabd4ff 100644
--- a/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
+++ b/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
@@ -54,6 +54,12 @@ public interface StudentTestManager{
 	 */
 	public PageData findById(PageData pd)throws Exception;
 	
+	/**通过试卷id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> findTestInfoByPid(PageData pd)throws Exception;
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java b/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
index d4e6fdf..dd6ff81 100644
--- a/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
+++ b/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
@@ -73,6 +73,14 @@ public class StudentTestService implements StudentTestManager{
 		return (PageData)dao.findForObject("StudentTestMapper.findById", pd);
 	}
 	
+	/**通过试卷id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> findTestInfoByPid(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForObject("StudentTestMapper.findTestInfoByPid", pd);
+	}
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
--
libgit2 0.21.4