孙向锦 / SunvoteEducation

Commit 099535ca0d7e0a5518dff0812c98758bfdd8eb03

Authored by =
2 parents d4647f91 bd553929

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

# Conflicts:
#	src/com/fh/controller/sunvote/homework/HomeworkController.java
Inline Side-by-side
Showing 4 changed files with 33 additions and 5 deletions
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @099535c
... ... @@ -287,7 +287,10 @@
287 287 sv_homework
288 288 LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
289 289 WHERE
290   - sv_homework.CLASS_ID = #{CLASS_ID}
  290 + sv_homework.CLASS_ID = #{CLASS_ID} and sv_homework.COMPLETE_COUNT > 0
  291 + <if test="HOMEWORK_ID != null and HOMEWORK_ID != ''"><!-- 关键词检索 -->
  292 + and HOMEWORK_ID = #{HOMEWORK_ID}
  293 + </if>
291 294 ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
292 295  
293 296 </select>
... ...
src/com/fh/controller/api/V1.java
  View file @099535c
... ... @@ -2895,6 +2895,7 @@ public class V1 extends BaseController {
2895 2895 homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
2896 2896 homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
2897 2897 homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
  2898 + homePd.put("COMPLETE_COUNT", "1");
2898 2899 homeworkService.edit(homePd);
2899 2900 List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
2900 2901 if(list == null || list.size() == 0){
... ... @@ -2903,6 +2904,7 @@ public class V1 extends BaseController {
2903 2904 List<PageData> student = studentService.findByClassId(homePd);
2904 2905 for(PageData ptd : student){
2905 2906 ptd.put("STUDENT_NAME", ptd.get("NAME"));
  2907 + ptd.put("HOMEWORK_REPORT_ID", this.get32UUID());
2906 2908 ptd.put("STUDENT_NO", ptd.get("SNO"));
2907 2909 ptd.put("RANK", student.size() + "");
2908 2910 ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
... ... @@ -2912,7 +2914,9 @@ public class V1 extends BaseController {
2912 2914 ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
2913 2915 }
2914 2916 // 2. 根据学生列表生成初始化成绩
2915   - homeworkReporkService.batchSave(student);
  2917 + if(student.size() > 0){
  2918 + homeworkReporkService.batchSave(student);
  2919 + }
2916 2920 }
2917 2921 List<ResultStudent> students = resultHomework.getSTUDENTS();
2918 2922 for(ResultStudent student:students){
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @099535c
... ... @@ -245,13 +245,29 @@ public class HomeworkController extends BaseController {
245 245 pd.put("TEACHER_ID", getTeacherID());
246 246 List<PageData> list = coursemanagementService.listTeacherClass(pd);
247 247 for(PageData ptd : list){
  248 +<<<<<<< HEAD
248 249 ptd.put("ClASS_ID", pd.get("ID"));
  250 +=======
  251 + ptd.put("CLASS_ID", ptd.get("ID"));
  252 +>>>>>>> bd553929bab8314313b820c4fd78254ca1640230
249 253 ptd.put("TEACHER_ID", pd.get("TEACHER_ID"));
250   - List<PageData> dataList = homeworkService.listAll(ptd);
251   - ptd.put("DETAIL", dataList);
  254 + List<PageData> homeworkList = homeworkService.listAll(ptd);
  255 + for(PageData hpd:homeworkList){
  256 + List<PageData> dataList = homeworkService.report(hpd);
  257 + hpd.put("STUDENTS", dataList);
  258 + hpd.remove("TEACHER_ID");
  259 + hpd.remove("CLASS_TYPE");
  260 + hpd.remove("BASESTATION_ID");
  261 + hpd.remove("SCHOOL_ID");
  262 + hpd.remove("GRADE_ID");
  263 + hpd.remove("ID");
  264 + }
  265 + ptd.put("HOMEWORKS", homeworkList);
252 266 }
253 267 pd.put("CLASS", list);
254   -
  268 + pd.remove("JSON");
  269 + pd.remove("JSON");
  270 + pd.remove("ID");
255 271 mv.setViewName("sunvote/homework/homework_report");
256 272 mv.addObject("pd", pd);
257 273 return mv;
... ...
src/com/fh/controller/sunvote/student/StudentController.java
  View file @099535c
... ... @@ -135,6 +135,9 @@ public class StudentController extends BaseController {
135 135 PageData tpd = getPageData();
136 136 PageData pd = new PageData();
137 137 String termID = tpd.getString("TERM_ID");
  138 + if(termID == null || "".equals(termID.trim())){
  139 + termID = getTermId();
  140 + }
138 141 String classID = tpd.getString("CLASS_ID");
139 142 if (null != file && !file.isEmpty()) {
140 143 String filePath = PathUtil.getClasspath() + Const.FILEPATHFILE; //文件上传路径
... ... @@ -157,6 +160,8 @@ public class StudentController extends BaseController {
157 160 if (savePd.values().size() > 0) {
158 161 String studentId = this.get32UUID();
159 162 savePd.put("ID", studentId);
  163 + savePd.put("CLASS_ID", classID);
  164 +
160 165 studentService.save(savePd);
161 166  
162 167 if (classID != null && termID != null) {
... ...