孙向锦 / SunvoteEducation

Commit 28fe22c6b5819acbd796d8b3cf4b5dadc7d7b9db

Authored by jack
2 parents bd4d8c01 cc36e109

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

Inline Side-by-side
Showing 24 changed files with 265 additions and 60 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @28fe22c
... ... @@ -60,7 +60,7 @@
60 60 </p>
61 61 <ul class="menu_1">
62 62 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
63   - <li onclick="event.stopPropagation();chooseListClass('${var.SCHOOL_ID}','${var.ID}')">
  63 + <li onclick="event.stopPropagation();chooseListClass('${SCHOOL_ID}','${var.ID}')">
64 64 <p>${ var.NAME }</p>
65 65 </li>
66 66 </c:forEach>
... ...
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
  View file @28fe22c
... ... @@ -57,17 +57,17 @@
57 57 </td>
58 58 </tr>
59 59  
60   - <tr>
  60 + <%-- <tr>
61 61 <td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
62 62 <td>
63   - <%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%>
  63 + <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td>
64 64 <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入班级类型">
65 65 <c:forEach var="item" items="${subjects}">
66 66 <option value="${item.ID}" <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
67 67 </c:forEach>
68 68 </select>
69 69 </td>
70   - </tr>
  70 + </tr> --%>
71 71 <tr>
72 72 <td style="width:75px;text-align: right;padding-top: 13px;">学期:</td>
73 73 <td>
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
  View file @28fe22c
... ... @@ -64,8 +64,8 @@
64 64 <th class="center"><div style="width:109px;">键盘</div></th>
65 65 <th class="center"><div style="width:80px;">正确率</div></th>
66 66 <th class="center"><div style="width:80px;">得分</div></th>
67   - <c:set value="${ fn:split(pd.DATA[0].ANSWER, ';') }" var="ANSWER" />
68   - <c:forEach items="${ANSWER}" var="var" varStatus="vs">
  67 + <c:set value="${ fn:split(pd.HOMEWORKINFO.ANSWER_PERSENT, ',') }" var="AN" />
  68 + <c:forEach items="${AN}" var="var" varStatus="vs">
69 69 <th class="center th_w"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
70 70 </c:forEach>
71 71  
... ... @@ -80,13 +80,14 @@
80 80 <tr>
81 81 <td class="center"><div style="width:80px;">${pd.DATA[vs.index].RANK}</div></td>
82 82 <td class="center"><div style="width:80px;">${var.NAME}</div></td>
83   - <td class="center"><div style="width:80px;">${var.SNO}</div></td>
  83 + <td class="center"><div style="width:80px;">${var.NUMBER}</div></td>
84 84 <td class="center"><div style="width:80px;">${var.KEYPAD_ID}</div></td>
85 85 <td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="0.00"/>%</div></td>
86 86 <td class="center"><div style="width:80px;">${pd.DATA[vs.index].STUDENT_SCORE}</div></td>
87   -
88   - <c:forEach items="${ANSWER}" var="var1" varStatus="vs1">
89   - <c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" />
  87 + <c:set value="${ fn:split(pd.DATA[vs.index].ANSWER, ';') }" var="ANSWER2" />
  88 + <c:set value="${ fn:split(pd.HOMEWORKINFO.ANSWER_PERSENT, ',') }" var="AN" />
  89 + <c:forEach items="${AN}" var="var1" varStatus="vs1">
  90 + <c:set value="${ fn:split(ANSWER2[vs1.index], ',') }" var="ANSWER1" />
90 91 <td class="center td_w" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td>
91 92 </c:forEach>
92 93  
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @28fe22c
... ... @@ -120,7 +120,7 @@
120 120 </tbody>
121 121 </table>
122 122 <div class="footer">
123   - <div class="creat">
  123 + <div class="creat" <c:if test="${pd.SCHOOL_ID != '' and pd.SCHOOL_ID != null}">style="display:none;"</c:if>>
124 124 <input type="button" onclick="add('${pd.TEACHER_ID}')" value="布置练习" />
125 125 </div>
126 126 <div class="removeAll">
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
  View file @28fe22c
... ... @@ -282,7 +282,7 @@
282 282 }
283 283  
284 284 function homeReport(classId){
285   - var path = '<%=basePath%>homework/report.do?CLASS_ID='+classId;
  285 + var path = '<%=basePath%>homework/report.do?School_id=${pd.SCHOOL_ID}&CLASS_ID='+classId;
286 286 console.log(path);
287 287 parent.$("#mainFrame").attr('src',path);
288 288 window.top.loading.show();
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
  View file @28fe22c
... ... @@ -138,7 +138,7 @@
138 138 </div>
139 139 <hr />
140 140 <div>
141   - <div style="text-align: center;" colspan="10">
  141 + <div style="text-align: center;display:none" colspan="10">
142 142  
143 143  
144 144 <a class="btn btn-mini btn-danger" onclick="back();">退出</a>
... ...
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
  View file @28fe22c
... ... @@ -48,14 +48,14 @@
48 48 <select name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
49 49 <option value="">全部</option>
50 50 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
51   - <option value="${var.GRADE_ID}" <c:if test="${pd.GRADE_ID==var.GRADE_ID}">selected="true"</c:if>>${var.GNAME}</option>
  51 + <option value="${var.ID}" <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.NAME}</option>
52 52 </c:forEach>
53 53 </select>
54 54 <label>科目: </label>&nbsp;&nbsp;
55 55 <select name="subject_id" id="subject_id" data-placeholder="这里输入所属科目">
56 56 <option value="">全部</option>
57 57 <c:forEach items="${subjectInfos}" var="var" varStatus="vs">
58   - <option value="${var.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID==var.SUBJECT_ID}">selected="true"</c:if>>${var.SCNAME}</option>
  58 + <option value="${var.ID}" <c:if test="${pd.SUBJECT_ID==var.ID}">selected="true"</c:if>>${var.CNAME}</option>
59 59 </c:forEach>
60 60 </select>&nbsp;&nbsp;&nbsp;&nbsp;
61 61 <input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
  View file @28fe22c
... ... @@ -48,11 +48,13 @@
48 48 </div>
49 49 <div class="name">
50 50 <p>Welcome！</p>
51   - <p id="name">${pd.TEACHER[0].TEACHER_NAME }</p>
52   - <p id="school">${pd.TEACHER[0].SCHOOL_NAME }</p>
  51 + <p id="name">${pd.TEACHER.TNAME }</p>
  52 + <p id="school">${pd.TEACHER.SNAME }</p>
53 53 </div>
54 54 </div>
55   - <div class="class tab1">
  55 + <br /> <br /> <br />
  56 +
  57 + <%-- <div class="class tab1">
56 58 <p>
57 59 Classes<span class="right jiao"></span>
58 60 </p>
... ... @@ -61,49 +63,51 @@
61 63 <li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.CLASS_NAME}
62 64 <span>${var.SUBJECT_ENAME}</span></p>
63 65 </li>
64   - </c:forEach>
  66 + </c:forEach>
65 67  
66 68 </ul>
67   - </div>
  69 + </div> --%>
68 70 <div class="testpaper tab1">
69   - <p>Test Papers<span class="right jiao"></span></p>
  71 + <p>E-Test<span class="right jiao"></span></p>
70 72 <ul class="menu_1">
71 73 <li >
72   - <p id="qingsongkao_paper">E-exam Papers</p>
  74 + <p id="qingsongkao_paper">Papers</p>
73 75 <!-- <ul class="menu_2">
74 76 <li><p>高一数学 202班</p></li>
75 77 <li><p>高一数学 203班</p></li>
76 78 </ul> -->
77 79 </li>
78   - <li>
79   - <p id="jishice_paper">E-class Papers</p>
80   -
81   - <!-- <ul class="menu_2">
82   - <li><p>高一数学 202班</p></li>
83   - <li><p>高一数学 203班</p></li>
84   - </ul> -->
  80 + <li >
  81 + <p>Tests</p>
  82 + <ul class="menu_2">
  83 + <c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
  84 + <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}
  85 + </p></li>
  86 + </c:forEach>
  87 + </ul>
85 88 </li>
  89 +
86 90 </ul>
87 91  
88 92 </div>
89 93 <div class="analyse tab1">
90 94 <p>
91   - Result Analysis<span class="right jiao"></span>
  95 + E-class<span class="right jiao"></span>
92 96 </p>
93 97  
94 98 <ul class="menu_1">
95   - <li >
96   - <p>E-exam Tests</p>
97   - <ul class="menu_2">
98   - <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
99   - <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
100   - </c:forEach>
101   - </ul>
  99 + <li>
  100 + <p id="jishice_paper">Papers</p>
  101 +
  102 + <!-- <ul class="menu_2">
  103 + <li><p>高一数学 202班</p></li>
  104 + <li><p>高一数学 203班</p></li>
  105 + </ul> -->
102 106 </li>
103 107 <li>
104   - <p>E-class Tests</p>
  108 + <p>Tests</p>
105 109 <ul class="menu_2">
106   - <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
  110 + <c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
107 111 <li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
108 112 </c:forEach>
109 113 </ul>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
  View file @28fe22c
... ... @@ -78,6 +78,16 @@
78 78 <td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
79 79 </tr>
80 80 <tr>
  81 + <td style="width:75px;text-align: right;padding-top: 13px;">所教科目:</td>
  82 + <td>
  83 + <select class="chosen-select form-control" name="SUBJECT_IDS" id="SUBJECT_IDS" data-placeholder="所教科目">
  84 + <c:forEach var="item" items="${subjects}">
  85 + <option value="${item.ID}" <c:if test="${pd.SUBJECT_IDS==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
  86 + </c:forEach>
  87 + </select>
  88 + </td>
  89 + </tr>
  90 + <tr>
81 91 <td style="text-align: center;" colspan="10">
82 92 <a class="btn btn-mini btn-primary" onclick="save();">保存</a>
83 93 <a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
  View file @28fe22c
... ... @@ -27,6 +27,7 @@
27 27 <body class="no-skin">
28 28  
29 29 <form action="teacher/listcs.do" method="post" name="Form" id="Form">
  30 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
30 31 <div class="head_box">
31 32 <div class="box_header">
32 33 <div class="head_box_l">
... ... @@ -46,7 +47,8 @@
46 47 <col style="width: 15%" />
47 48 <col style="width: 15%" />
48 49 <col style="width: 7%" />
49   - <col style="width: 15%" />
  50 + <col style="width: 8%" />
  51 + <col style="width: 7%" />
50 52 <col style="width: 9%" />
51 53 <thead>
52 54 <tr>
... ... @@ -58,6 +60,7 @@
58 60 <th class="center">账号</th>
59 61 <th class="center">性别</th>
60 62 <th class="center">教师卡编号</th>
  63 + <th class="center">科目</th>
61 64 <th class="center">操作</th>
62 65 </tr>
63 66 </thead>
... ... @@ -73,7 +76,8 @@
73 76 <col style="width: 15%" />
74 77 <col style="width: 15%" />
75 78 <col style="width: 7%" />
76   - <col style="width: 15%" />
  79 + <col style="width: 8%" />
  80 + <col style="width: 7%" />
77 81 <col style="width: 9%" />
78 82 <tbody>
79 83 <!-- 开始循环 -->
... ... @@ -89,6 +93,7 @@
89 93 <td class='center'>${var.ACCOUT}</td>
90 94 <td class='center'>${var.SEX == 1? "男":"女"}</td>
91 95 <td class='center'>${var.KEYPAD_ID}</td>
  96 + <td class='center'>${myelfun:findSubjectCName(var.SUBJECT_IDS)}</td>
92 97 <td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
93 98  
94 99 </tr>
... ... @@ -108,7 +113,7 @@
108 113 <input type="button" onclick="add();" value="添加老师" />
109 114 </div>
110 115 <div class="removeAll">
111   - <input type="button" onclick="deleteAll()" value="删除" />
  116 + <input type="button" onclick="del()" value="删除" />
112 117 </div>
113 118 <div class="page_box">
114 119 <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
... ... @@ -206,6 +211,11 @@
206 211 window.top.loading.remove();
207 212 });
208 213  
  214 + //检索
  215 + function tosearch(){
  216 + $("#Form").submit();
  217 + }
  218 +
209 219 function edit(Id){
210 220 window.top.modal.init({
211 221 'title':'修改信息',
... ... @@ -230,6 +240,41 @@
230 240  
231 241 function save(){
232 242  
  243 + }
  244 +
  245 + function del(Id){
  246 + window.top.remove.init({"title":"删除","func":function(success){
  247 + if(success){
  248 + var all = typeof Id == "undefined" ? true : false;
  249 + var str = Id;
  250 + if(all){
  251 + str = '' ;
  252 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  253 + if(document.getElementsByName('ids')[i].checked){
  254 + if(str=='') str += document.getElementsByName('ids')[i].value;
  255 + else str += ',' + document.getElementsByName('ids')[i].value;
  256 + }
  257 + }
  258 + }
  259 +
  260 + $.ajax({
  261 + type: "POST",
  262 + url: '<%=basePath%>teacher/deleteAll.do?tm='+new Date().getTime(),
  263 + data: {DATA_IDS:str},
  264 + dataType:'json',
  265 + //beforeSend: validateData,
  266 + cache: false,
  267 + success: function(data){
  268 + tosearch();
  269 + }
  270 + });
  271 +
  272 + }
  273 + else{
  274 + console.log("false");
  275 + }
  276 + }});
  277 + window.top.remove.show();
233 278 }
234 279 </script>
235 280  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @28fe22c
... ... @@ -197,7 +197,7 @@
197 197 function homeWorkList(schoolId){
198 198 //var path = "../school/goEdit2.do?ID=" + schoolId ;
199 199  
200   - var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
  200 + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ;
201 201  
202 202 $("#mainFrame").attr('src',path);
203 203 window.top.loading.show();
... ...
resources/dbconfig.properties
  View file @28fe22c
1 1 #数据源 1
2   -url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
  2 +url:jdbc:mysql://47.107.98.47:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
3 3 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
4 4 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
5 5 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
... ...
resources/mybatis1/sunvote/CourseManagementMapper.xml
  View file @28fe22c
... ... @@ -101,6 +101,20 @@
101 101 ID = #{ID}
102 102 </select>
103 103  
  104 + <select id="findByCourse" parameterType="pd" resultType="pd">
  105 + select
  106 + <include refid="Field"></include>
  107 + from
  108 + <include refid="tableName"></include>
  109 + where
  110 + 1 =1
  111 + and TEACHER_ID = #{TEACHER_ID}
  112 + and CLASS_ID= #{TEACHER_ID}
  113 + and SUBJECT_ID= #{TEACHER_ID}
  114 +
  115 + limit 0,1
  116 + </select>
  117 +
104 118 <!-- 列表 -->
105 119 <select id="datalistPage" parameterType="page" resultType="pd">
106 120 select
... ... @@ -161,7 +175,14 @@
161 175 sv_coursemanagement
162 176 LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
163 177 WHERE
164   - sv_coursemanagement.TEACHER_ID = #{TEACHER_ID}
  178 + 1 = 1
  179 + <if test="TEACHER_ID != null and TEACHER_ID != ''">
  180 + and sv_coursemanagement.TEACHER_ID = #{TEACHER_ID}
  181 + </if>
  182 + <if test="SCHOOL_ID != null and SCHOOL_ID != ''">
  183 + and sv_coursemanagement.SCHOOL_ID = #{SCHOOL_ID}
  184 + </if>
  185 + group by sv_sclass.CLASS_CODE
165 186 order by sv_sclass.CLASS_CODE
166 187  
167 188 </select>
... ...
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @28fe22c
... ... @@ -266,6 +266,10 @@
266 266 ALL_SCORE,
267 267 QUESTION_COUNT,
268 268 COMPLETE_DESC,
  269 + ANSWER_PERSENT,
  270 + GET_MAX_SCORE,
  271 + GET_SCORE,
  272 + GET_SCORE_PERSENT,
269 273 HOMEWORK_ID
270 274 from
271 275 <include refid="tableName"></include>
... ...
resources/mybatis1/sunvote/HomeworkReportMapper.xml
  View file @28fe22c
... ... @@ -12,6 +12,7 @@
12 12 HOMEWORK_REPORT_ID,
13 13 RANK,
14 14 STUDENT_NAME,
  15 + STUDENT_ID,
15 16 STUDNET_NO,
16 17 KEYBOARD,
17 18 RIGHT_PERSENT,
... ... @@ -26,6 +27,7 @@
26 27 #{HOMEWORK_REPORT_ID},
27 28 #{RANK},
28 29 #{STUDENT_NAME},
  30 + #{STUDENT_ID},
29 31 #{STUDNET_NO},
30 32 #{KEYBOARD},
31 33 #{RIGHT_PERSENT},
... ... @@ -61,6 +63,7 @@
61 63 set
62 64 RANK = #{RANK},
63 65 STUDENT_NAME = #{STUDENT_NAME},
  66 + STUDENT_ID = #{STUDENT_ID},
64 67 STUDNET_NO = #{STUDNET_NO},
65 68 KEYBOARD = #{KEYBOARD},
66 69 RIGHT_PERSENT = #{RIGHT_PERSENT},
... ... @@ -78,6 +81,7 @@
78 81 set
79 82 RANK = #{RANK},
80 83 STUDENT_NAME = #{STUDENT_NAME},
  84 + STUDENT_ID = #{STUDENT_ID},
81 85 STUDNET_NO = #{STUDNET_NO},
82 86 KEYBOARD = #{KEYBOARD},
83 87 RIGHT_PERSENT = #{RIGHT_PERSENT},
... ... @@ -85,9 +89,9 @@
85 89 ANSWER = #{ANSWER},
86 90 HOMEWORK_ID = #{HOMEWORK_ID}
87 91 where
  92 + STUDENT_ID = #{STUDENT_ID}
  93 + and
88 94 HOMEWORK_ID = #{HOMEWORK_ID}
89   - and
90   - STUDNET_NO = #{STUDNET_NO}
91 95 </update>
92 96  
93 97 <!-- 通过ID获取数据 -->
... ... @@ -164,13 +168,14 @@
164 168 #{item.HOMEWORK_REPORT_ID},
165 169 #{item.RANK},
166 170 #{item.STUDENT_NAME},
  171 + #{item.STUDENT_ID},
167 172 #{item.STUDNET_NO},
168 173 #{item.KEYBOARD},
169 174 #{item.RIGHT_PERSENT},
170 175 #{item.GET_SCORE},
171 176 #{item.ANSWER},
  177 + #{item.COMPLETE_COUNT},
172 178 #{item.HOMEWORK_ID}
173   - #{item.COMPLETE_COUNT}
174 179 )
175 180 </foreach>
176 181 </insert>
... ...
resources/mybatis1/sunvote/StudentMapper.xml
  View file @28fe22c
... ... @@ -95,6 +95,7 @@
95 95 <include refid="tableName"></include>
96 96 where
97 97 CLASS_ID = #{CLASS_ID}
  98 + order by (sv_student.NUMBER ) * 1,(sv_student.KEYPAD_ID * 1),(sv_student.SNO*1)
98 99 </select>
99 100  
100 101 <!-- 通过ID获取数据 -->
... ...
src/com/fh/controller/api/V1.java
  View file @28fe22c
... ... @@ -98,7 +98,7 @@ public class V1 extends BaseController {
98 98 private ClassRosterManager classrosterService;
99 99  
100 100 @Resource(name = "classtypeService")
101   - private ClassTypeManager classtypeService;
  101 + private ClassTypeManager classtypeService;
102 102  
103 103 @Resource(name = "gradeService")
104 104 private GradeManager gradeService;
... ... @@ -1575,7 +1575,9 @@ public class V1 extends BaseController {
1575 1575 }
1576 1576 }
1577 1577 }
1578   - testpaperinfoService.batchSave(testInfoPdList);
  1578 + if(testInfoPdList != null && testInfoPdList.size() > 0){
  1579 + testpaperinfoService.batchSave(testInfoPdList);
  1580 + }
1579 1581 }
1580 1582 } else {
1581 1583 testPaperId = listData.get(0).getString("TESTPAPER_ID");
... ... @@ -1700,7 +1702,9 @@ public class V1 extends BaseController {
1700 1702 }
1701 1703 }
1702 1704 }
1703   - testpaperinfoService.batchSave(testInfoPdList);
  1705 + if(testInfoPdList != null && testInfoPdList.size() > 0){
  1706 + testpaperinfoService.batchSave(testInfoPdList);
  1707 + }
1704 1708 }
1705 1709 res.setData(testPaperId);
1706 1710 } catch (Exception e) {
... ... @@ -2904,9 +2908,10 @@ public class V1 extends BaseController {
2904 2908 // 1. 根据班级id 查询班级学生列表
2905 2909 List<PageData> student = studentService.findByClassId(homePd);
2906 2910 for(PageData ptd : student){
  2911 + ptd.put("STUDENT_ID", ptd.get("ID"));
2907 2912 ptd.put("STUDENT_NAME", ptd.get("NAME"));
2908 2913 ptd.put("HOMEWORK_REPORT_ID", this.get32UUID());
2909   - ptd.put("STUDENT_NO", ptd.get("SNO"));
  2914 + ptd.put("STUDNET_NO", ptd.get("NUMBER"));
2910 2915 ptd.put("RANK", student.size() + "");
2911 2916 ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
2912 2917 ptd.put("RIGHT_PERSENT", "0%");
... ... @@ -2926,7 +2931,7 @@ public class V1 extends BaseController {
2926 2931 // update 学生作业情况
2927 2932 PageData tpd = new PageData();
2928 2933 tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
2929   - tpd.put("STUDENT_NO", student.getSTUDENT_NO());
  2934 + tpd.put("STUDNET_NO", student.getSTUDENT_NO());
2930 2935 tpd.put("STUDENT_ID", student.getSTUDENT_ID());
2931 2936 tpd.put("RANK", student.getRANK());
2932 2937 tpd.put("KEYBOARD", student.getKEYBOARD());
... ... @@ -2986,7 +2991,9 @@ public class V1 extends BaseController {
2986 2991 ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
2987 2992 }
2988 2993 // 2. 根据学生列表生成初始化成绩
2989   - homeworkReporkService.batchSave(student);
  2994 + if(student != null && student.size() > 0){
  2995 + homeworkReporkService.batchSave(student);
  2996 + }
2990 2997 }
2991 2998 List<ResultStudent> students = resultHomework.getSTUDENTS();
2992 2999 for(ResultStudent student:students){
... ...
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
  View file @28fe22c
... ... @@ -90,7 +90,15 @@ public class CourseManagementController extends BaseController {
90 90 PageData pd = new PageData();
91 91 pd = this.getPageData();
92 92 pd.put("ID", this.get32UUID());
93   - coursemanagementService.save(pd);
  93 + PageData tpd = new PageData();
  94 + tpd.put("ID", pd.get("TEACHER_ID"));
  95 + tpd = teacherService.findById(tpd);
  96 + pd.put("SUBJECT_ID", tpd.get("SUBJECT_IDS"));
  97 + if(coursemanagementService.findByCourse(pd) == null){
  98 + coursemanagementService.save(pd);
  99 + }else{
  100 + //TODO
  101 + }
94 102 mv.addObject("msg","success");
95 103 mv.setViewName("save_result2");
96 104 return mv;
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @28fe22c
... ... @@ -5,6 +5,8 @@ import java.text.DateFormat;
5 5 import java.text.SimpleDateFormat;
6 6 import java.util.ArrayList;
7 7 import java.util.Calendar;
  8 +import java.util.Collections;
  9 +import java.util.Comparator;
8 10 import java.util.Date;
9 11 import java.util.HashMap;
10 12 import java.util.List;
... ... @@ -31,6 +33,8 @@ import com.fh.service.sunvote.homework.HomeworkManager;
31 33 import com.fh.service.sunvote.homework.HomeworkReportManager;
32 34 import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
33 35 import com.fh.service.sunvote.student.StudentManager;
  36 +import com.fh.service.sunvote.teacher.TeacherManager;
  37 +import com.fh.service.sunvote.teacher.impl.TeacherService;
34 38 import com.fh.util.AppUtil;
35 39 import com.fh.util.Jurisdiction;
36 40 import com.fh.util.ObjectExcelView;
... ... @@ -61,6 +65,9 @@ public class HomeworkController extends BaseController {
61 65  
62 66 @Resource(name="studentService")
63 67 private StudentManager studentService;
  68 +
  69 + @Resource(name = "teacherService")
  70 + private TeacherManager teacherService;
64 71  
65 72 /**
66 73 * 保存
... ... @@ -125,10 +132,10 @@ public class HomeworkController extends BaseController {
125 132 logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
126 133 ModelAndView mv = this.getModelAndView();
127 134 PageData pd = new PageData();
128   - if(pd.get("TEACHER_ID") == null){
  135 + pd = this.getPageData();
  136 + if(pd.get("SCHOOL_ID") == null){
129 137 pd.put("TEACHER_ID", getTeacherID());
130 138 }
131   - pd = this.getPageData();
132 139 String keywords = pd.getString("keywords"); // 关键词检索条件
133 140 if (null != keywords && !"".equals(keywords)) {
134 141 pd.put("keywords", keywords.trim());
... ... @@ -275,7 +282,9 @@ public class HomeworkController extends BaseController {
275 282 ModelAndView mv = this.getModelAndView();
276 283 PageData pd = new PageData();
277 284 pd = this.getPageData();
278   - pd.put("TEACHER_ID", getTeacherID());
  285 + if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){
  286 + pd.put("TEACHER_ID", getTeacherID());
  287 + }
279 288  
280 289  
281 290 if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
... ... @@ -362,6 +371,7 @@ public class HomeworkController extends BaseController {
362 371 stuPd.put("STUDENT_ID", stuPd.get("ID"));
363 372 stuPd.remove("ID");
364 373 }
  374 +
365 375 for (PageData hpd : homeworkList) {
366 376 hpd.remove("QUESTION_COUNT");
367 377 hpd.remove("COMPLETE_COUNT");
... ... @@ -497,6 +507,55 @@ public class HomeworkController extends BaseController {
497 507 }
498 508 if(pd.get("HOMEWORK_ID") != null){
499 509 List<PageData> dataList = homeworkService.report(pd);
  510 + Collections.sort(dataList,new Comparator<PageData>(){
  511 +
  512 + @Override
  513 + public int compare(PageData o1, PageData o2) {
  514 + String o1GetScore = o1.getString("STUDENT_SCORE");
  515 + String o2GetScore = o2.getString("STUDENT_SCORE");
  516 + float o1score = 0 ;
  517 + float o2score = 0 ;
  518 + try{
  519 + o1score = Float.parseFloat(o1GetScore);
  520 + }catch(Exception e){
  521 + o1score = -1 ;
  522 + }
  523 + try{
  524 + o2score = Float.parseFloat(o2GetScore);
  525 + }catch(Exception e){
  526 + o2score = -1 ;
  527 + }
  528 + return o1score - o2score > 0 ? -1 : 1;
  529 + }
  530 +
  531 + });
  532 + for(int i = 0 ; i < dataList.size(); i++){
  533 + PageData tpd1 = dataList.get(i);
  534 + if(i == 0){
  535 + tpd1.put("RANK", (i+1));
  536 + }else{
  537 + PageData tpd2 = dataList.get(i-1);
  538 + String o1GetScore = tpd1.getString("STUDENT_SCORE");
  539 + String o2GetScore = tpd2.getString("STUDENT_SCORE");
  540 + float o1score = 0 ;
  541 + float o2score = 0 ;
  542 + try{
  543 + o1score = Float.parseFloat(o1GetScore);
  544 + }catch(Exception e){
  545 + o1score = -1 ;
  546 + }
  547 + try{
  548 + o2score = Float.parseFloat(o2GetScore);
  549 + }catch(Exception e){
  550 + o2score = -1 ;
  551 + }
  552 + if(o2score - o1score == 0){
  553 + tpd1.put("RANK",tpd2.get("RANK"));
  554 + }else{
  555 + tpd1.put("RANK", (i+1));
  556 + }
  557 + }
  558 + }
500 559 pd.put("DATA", dataList);
501 560 }
502 561 if(pd.get("CLASS_ID") != null){
... ... @@ -689,6 +748,7 @@ public class HomeworkController extends BaseController {
689 748 PageData pd = new PageData();
690 749 pd = this.getPageData();
691 750 pd.put("HOMEWORK_ID", this.get32UUID());
  751 + pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
692 752 homeworkService.save(pd);
693 753 ResponseGson<String> responseGson = new ResponseGson<String>();
694 754 responseGson.setData(pd.getString("HOMEWORK_ID"));
... ... @@ -706,11 +766,15 @@ public class HomeworkController extends BaseController {
706 766  
707 767 Homework homework = Homework.parse(data);
708 768  
  769 + pd.put("ID", getTeacherID());
  770 + PageData tmpd = teacherService.findById(pd);
  771 +
709 772 PageData hpd = new PageData();
710 773 if (homework != null) {
711 774 hpd.put("CODE", get32UUID());
712 775 hpd.put("NAME", homework.getNAME());
713 776 if(homework.getSUBJECT_ID() == null){
  777 + pd.put("TEACHER_ID", homework.getTEACHER_ID());
714 778 List<PageData> slist = homeworkService.querySubjectId(pd);
715 779 if(slist.size() > 0){
716 780 homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
... ... @@ -724,6 +788,7 @@ public class HomeworkController extends BaseController {
724 788 hpd.put("MODIFY_DATE", format.format(new Date()));
725 789 hpd.put("COMPLETE_COUNT", 0);
726 790 hpd.put("TEACHER_ID", homework.getTEACHER_ID());
  791 + hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
727 792 hpd.put("COMPLETE_DESC", "");
728 793  
729 794 if (homework.getCLASSLIST() != null
... ... @@ -772,7 +837,8 @@ public class HomeworkController extends BaseController {
772 837 ResponseGson<String> responseGson = new ResponseGson<String>();
773 838  
774 839 Homework homework = Homework.parse(data);
775   -
  840 + pd.put("ID", getTeacherID());
  841 + PageData tmpd = teacherService.findById(pd);
776 842 PageData hpd = new PageData();
777 843 if (homework != null) {
778 844 if (homework.getHOMEWORK_ID() != null
... ... @@ -790,6 +856,7 @@ public class HomeworkController extends BaseController {
790 856 hpd.put("COMPLETE_COUNT", 0);
791 857 hpd.put("TEACHER_ID", homework.getTEACHER_ID());
792 858 hpd.put("COMPLETE_DESC", "");
  859 + hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
793 860 if(homeworkService.findByCode(hpd).size() > 1){
794 861 hpd.put("CODE", get32UUID());
795 862 for (HomeClass homeclass : homework.getCLASSLIST()) {
... ...
src/com/fh/controller/sunvote/report/ReportController.java
  View file @28fe22c
... ... @@ -192,6 +192,7 @@ public class ReportController extends BaseController {
192 192 }else{
193 193 mv.setViewName("sunvote/teacher/en_teacher_report_1");
194 194 }
  195 +
195 196 return mv;
196 197 }
197 198  
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @28fe22c
... ... @@ -25,6 +25,8 @@ import com.fh.controller.base.BaseController;
25 25 import com.fh.entity.Page;
26 26 import com.fh.service.api.V1Manager;
27 27 import com.fh.service.sunvote.school.SchoolManager;
  28 +import com.fh.service.sunvote.subject.SubjectManager;
  29 +import com.fh.service.sunvote.subject.impl.SubjectService;
28 30 import com.fh.service.sunvote.teacher.TeacherManager;
29 31 import com.fh.service.system.fhlog.FHlogManager;
30 32 import com.fh.service.system.user.UserManager;
... ... @@ -57,6 +59,8 @@ public class TeacherController extends BaseController {
57 59 @Resource(name = "v1Service")
58 60 private V1Manager v1Service;
59 61  
  62 + @Resource(name="subjectService")
  63 + private SubjectManager subjectService;
60 64 /**
61 65 * 保存
62 66 *
... ... @@ -584,6 +588,11 @@ public class TeacherController extends BaseController {
584 588 List<PageData> schools = schoolService.listAll(pd);
585 589 mv.addObject("schools", schools);
586 590  
  591 + List<PageData> subjects = subjectService.listAllSchool(pd);
  592 + mv.addObject("subjects", subjects);
  593 +
  594 +
  595 +
587 596 mv.addObject("msg", "save2");
588 597 mv.addObject("pd", pd);
589 598 return mv;
... ... @@ -624,6 +633,8 @@ public class TeacherController extends BaseController {
624 633 mv.setViewName("sunvote/teacher/teacher_edit2");
625 634 List<PageData> schools = schoolService.listAll(pd);
626 635 mv.addObject("schools", schools);
  636 + List<PageData> subjects = subjectService.listAllSchool(pd);
  637 + mv.addObject("subjects", subjects);
627 638 mv.addObject("msg", "edit2");
628 639 mv.addObject("pd", pd);
629 640 return mv;
... ... @@ -646,6 +657,8 @@ public class TeacherController extends BaseController {
646 657 mv.setViewName("sunvote/teacher/teacher_edit3");
647 658 List<PageData> schools = schoolService.listAll(pd);
648 659 mv.addObject("schools", schools);
  660 + List<PageData> subjects = subjectService.listAllSchool(pd);
  661 + mv.addObject("subjects", subjects);
649 662 mv.addObject("msg", "edit2");
650 663 mv.addObject("pd", pd);
651 664 return mv;
... ...
src/com/fh/controller/system/login/LoginController.java
  View file @28fe22c
... ... @@ -274,14 +274,19 @@ public class LoginController extends BaseController {
274 274 }else if("admin".equals(changeMenu)){
275 275 PageData tpd = new PageData();
276 276 tpd.put("ID", user.getUSER_ID());
277   - String schoolId = "" ;
278 277 PageData adminInfos = v1Service.getAdminInfo(tpd);
  278 + String schoolId = adminInfos.getString("SCHOOL_ID");
279 279 // 查询学校信息
280 280 Object tgradleId = "" ;
281 281  
282 282 session.setAttribute(USERNAME + Const.ROLE_ID,
283 283 "admin");
284 284 List<PageData> gradeInfos = schoolgradesubjectService.listAllGrade(adminInfos);
  285 + for(PageData grade : gradeInfos){
  286 + grade.put("GRADE_ID", grade.get("ID"));
  287 + grade.put("SCHOOL_ID", adminInfos.get("ID"));
  288 + grade.put("classInfos", sclassService.listAll(grade));
  289 + }
285 290 mv.addObject("gradeInfos", gradeInfos);
286 291 mv.addObject("adminInfos", adminInfos);
287 292 mv.addObject("SCHOOL_ID", adminInfos.get("ID"));
... ...
src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
  View file @28fe22c
... ... @@ -48,6 +48,11 @@ public interface CourseManagementManager{
48 48 * @throws Exception
49 49 */
50 50 public PageData findById(PageData pd)throws Exception;
  51 + /**通过id获取数据
  52 + * @param pd
  53 + * @throws Exception
  54 + */
  55 + public PageData findByCourse(PageData pd)throws Exception;
51 56  
52 57 /**批量删除
53 58 * @param ArrayDATA_IDS
... ...
src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
  View file @28fe22c
... ... @@ -85,6 +85,14 @@ public class CourseManagementService implements CourseManagementManager{
85 85 return (PageData)dao.findForObject("CourseManagementMapper.findById", pd);
86 86 }
87 87  
  88 + /**通过id获取数据
  89 + * @param pd
  90 + * @throws Exception
  91 + */
  92 + public PageData findByCourse(PageData pd)throws Exception{
  93 + return (PageData)dao.findForObject("CourseManagementMapper.findByCourse", pd);
  94 + }
  95 +
88 96 /**批量删除
89 97 * @param ArrayDATA_IDS
90 98 * @throws Exception
... ...