diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index 20d6870..b315b3d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -62,9 +62,9 @@
class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
style="width:88px;" placeholder="结束日期" title="结束日期" />
-
|
diff --git a/WebRoot/static/files/Template1.xls b/WebRoot/static/files/Template1.xls
index d88c1bc..1c5bd6f 100644
--- a/WebRoot/static/files/Template1.xls
+++ b/WebRoot/static/files/Template1.xls
diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties
index 9689fdc..e7df42d 100644
--- a/resources/dbconfig.properties
+++ b/resources/dbconfig.properties
@@ -1,9 +1,10 @@
#数据源 1
-url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
#url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
#url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
#url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
#url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+url:jdbc:mysql://121.40.201.117:3306/luming?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
driverClassName:com.mysql.jdbc.Driver
#username:root
#password:ZrZxKeYp
diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index 9a65851..0e66932 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -187,11 +187,13 @@
sv_student.KEYPAD_ID,
sv_student.REMARK,
sv_student.ID,
- sv_sclass.CLASS_NAME
+ sv_sclass.CLASS_NAME,
+ sv_grade.`NAME` AS GRADE_NAME
from sv_student
LEFT JOIN sv_classroster cr ON sv_student.ID = cr.STUDENT_ID
LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
LEFT JOIN sv_sclass ON cr.SCLASS_ID = sv_sclass.ID
+ LEFT JOIN sv_grade ON sv_sclass.GRADE_ID = sv_grade.ID
WHERE
1 = 1
AND sv_term.START_DATE < NOW()
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index 83c7208..004f8b1 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -393,6 +393,7 @@ public class StudentController extends BaseController {
titles.add("学号"); //2
titles.add("键盘ID"); //3
titles.add("年级"); //4
+ titles.add("班级"); //4
// titles.add("组号"); //5
// titles.add("签到码"); //6
// titles.add("家长姓名"); //7
@@ -407,7 +408,9 @@ public class StudentController extends BaseController {
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")); //1
// vpd.put("var2", varOList.get(i).getString("SNO")); //2
// vpd.put("var3", varOList.get(i).getString("NUMBER")); //3