diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp index f700475..84b5cce 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp @@ -59,8 +59,8 @@ - + 序号 @@ -84,8 +84,8 @@ - + diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index d9a5e16..187cfb2 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java @@ -61,16 +61,16 @@ public class TeacherController extends BaseController { @Resource(name = "fhlogService") private FHlogManager FHLOG; - + @Resource(name = "v1Service") private V1Manager v1Service; - @Resource(name="subjectService") + @Resource(name = "subjectService") private SubjectManager subjectService; - - @Resource(name="coursemanagementService") + + @Resource(name = "coursemanagementService") private CourseManagementManager coursemanagementService; - + /** * 保存 * @@ -111,7 +111,7 @@ public class TeacherController extends BaseController { mv.setViewName("save_result"); return mv; } - + /** * 保存 * @@ -124,7 +124,7 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("ID", this.get32UUID()); - + pd.put("USER_ID", pd.getString("ID")); // ID 主键 pd.put("LAST_LOGIN", ""); // 最后登录时间 pd.put("IP", ""); // IP @@ -136,19 +136,18 @@ public class TeacherController extends BaseController { pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd .getString("PASSWORD")).toString()); // 密码加密 - + if (null == userService.findByUsername(pd)) { // 判断用户名是否存在 teacherService.save(pd); userService.saveU(pd); // 执行保存 mv.addObject("msg", "success"); FHLOG.save(Jurisdiction.getUsername(), "新增系统用户：" + pd.getString("USERNAME")); - }else{ + } else { mv.addObject("msg", "用户名系统已存在。"); - + } - - + mv.setViewName("save_result2"); return mv; } @@ -166,7 +165,7 @@ public class TeacherController extends BaseController { return; } // 校验权限 PageData pd = new PageData(); - pd = this.getPageData(); + pd = this.getPageData(); pd.put("USER_ID", pd.get("ID")); teacherService.delete(pd); userService.deleteU(pd); @@ -206,7 +205,7 @@ public class TeacherController extends BaseController { mv.setViewName("save_result"); return mv; } - + /** * 修改 * @@ -221,7 +220,7 @@ public class TeacherController extends BaseController { pd = this.getPageData(); PageData n = teacherService.findById(pd); PageData temp = new PageData(); - temp.put("TEACHER_ID",n.get("ID").toString()); + temp.put("TEACHER_ID", n.get("ID").toString()); PageData p = coursemanagementService.findByTid(temp); pd.put("PASSWORD", new SimpleHash("SHA-1", n.getString("ACCOUT"), pd @@ -235,7 +234,7 @@ public class TeacherController extends BaseController { pd.put("RIGHTS", ""); pd.put("USERNAME", n.getString("ACCOUT")); pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64"); - + userService.editU(pd); // 执行保存 p.put("SUBJECT_ID", pd.get("SUBJECT_IDS")); coursemanagementService.edit(p); @@ -243,8 +242,7 @@ public class TeacherController extends BaseController { mv.setViewName("save_result2"); return mv; } - - + /** * 修改 * @@ -258,8 +256,9 @@ public class TeacherController extends BaseController { pd = this.getPageData(); PageData n = teacherService.findById(pd); ResponseGson ret = new ResponseGson(); - String oldPass = new SimpleHash("SHA-1", n.getString("ACCOUT"), pd.get("OLDPASSWORD")).toString(); - if(n.get("PASSWORD").equals(oldPass)){ + String oldPass = new SimpleHash("SHA-1", n.getString("ACCOUT"), + pd.get("OLDPASSWORD")).toString(); + if (n.get("PASSWORD").equals(oldPass)) { teacherService.edit(pd); pd.put("USER_ID", pd.getString("ID")); // ID 主键 pd.put("LAST_LOGIN", ""); // 最后登录时间 @@ -269,13 +268,12 @@ 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()); // 密码加密 + pd.put("PASSWORD", new SimpleHash("SHA-1", n.getString("ACCOUT"), + pd.getString("PASSWORD")).toString()); // 密码加密 userService.editU(pd); // 执行保存 teacherService.edit(pd); ret.setData("Success"); - }else{ + } else { ret.set5Error(); ret.setData("Fail"); } @@ -295,16 +293,16 @@ public class TeacherController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/teach_paper"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_teach_paper"); } pd.put("userId", userId); mv.addObject("pd", pd); return mv; } - + /** * 列表 * @@ -323,6 +321,7 @@ public class TeacherController extends BaseController { mv.addObject("pd", pd); return mv; } + /** * 列表 * @@ -337,15 +336,15 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("userId", userId); - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/test_list"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_test_list"); } mv.addObject("pd", pd); return mv; } - + /** * 列表 * @@ -362,16 +361,16 @@ public class TeacherController extends BaseController { pd.put("userId", userId); pd.put("ID", getTeacherID()); PageData pageData = teacherService.findById(pd); - pd.put("subject_id", pageData.get("SUBJECT_IDS")); - if(isChineseLanguageClient()){ + pd.put("subject_id", pageData.get("SUBJECT_IDS")); + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/paper_view"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_paper_view"); } mv.addObject("pd", pd); return mv; } - + private String getSubjectID(String userId) { PageData pt = new PageData(); pt.put("TEACHER_ID", userId); @@ -380,7 +379,8 @@ public class TeacherController extends BaseController { if (subjectList != null && subjectList.size() > 0) { return subjectList.get(0).getString("SUBJECT_ID"); } - }catch(Exception ex){} + } catch (Exception ex) { + } return null; } @@ -398,15 +398,15 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("userId", userId); - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/paper_view2"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_paper_view2"); } mv.addObject("pd", pd); return mv; } - + /** * 列表 * @@ -421,16 +421,16 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("userId", userId); - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/paper_view1"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_paper_view1"); } - + mv.addObject("pd", pd); return mv; } - + /** * 列表 * @@ -445,38 +445,46 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("userId", userId); - if(pd.get("TEST_ID") == null){ + if (pd.get("TEST_ID") == null) { pd.put("TEST_ID", pd.get("TESTPAPERID")); } - List diffcultClassList = teacherService.diffcultClassReport(pd); - for(PageData diffcultPd : diffcultClassList){ - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); + List diffcultClassList = teacherService + .diffcultClassReport(pd); + for (PageData diffcultPd : diffcultClassList) { + double rightNum = Double.parseDouble(diffcultPd + .getString("RIGHT_NUM")); double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); - double persent = rightNum * 100.0 / allNum ; + double persent = rightNum * 100.0 / allNum; diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); } - - List diffcultStudentList = teacherService.diffcultStudentReport(pd); - for(PageData diffcultPd : diffcultStudentList){ - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); + + List diffcultStudentList = teacherService + .diffcultStudentReport(pd); + for (PageData diffcultPd : diffcultStudentList) { + double rightNum = Double.parseDouble(diffcultPd + .getString("RIGHT_NUM")); double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); - double persent = rightNum * 100.0 / allNum ; + double persent = rightNum * 100.0 / allNum; diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); } - - List knowadgeClassList = teacherService.knowadgeClassReport(pd); - for(PageData diffcultPd : knowadgeClassList){ - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); + + List knowadgeClassList = teacherService + .knowadgeClassReport(pd); + for (PageData diffcultPd : knowadgeClassList) { + double rightNum = Double.parseDouble(diffcultPd + .getString("RIGHT_NUM")); double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); - double persent = rightNum * 100.0 / allNum ; + double persent = rightNum * 100.0 / allNum; diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); } - - List knowadgeStudentList = teacherService.knowadgeStudentReport(pd); - for(PageData diffcultPd : knowadgeStudentList){ - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); + + List knowadgeStudentList = teacherService + .knowadgeStudentReport(pd); + for (PageData diffcultPd : knowadgeStudentList) { + double rightNum = Double.parseDouble(diffcultPd + .getString("RIGHT_NUM")); double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); - double persent = rightNum * 100.0 / allNum ; + double persent = rightNum * 100.0 / allNum; diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); } mv.addObject("diffcultClassList", diffcultClassList); @@ -485,14 +493,11 @@ public class TeacherController extends BaseController { mv.addObject("knowadgeClassList", knowadgeClassList); mv.addObject("knowadgeClassListSize", knowadgeClassList.size()); mv.addObject("knowadgeStudentList", knowadgeStudentList); - + mv.setViewName("sunvote/teacher/paper_report"); mv.addObject("pd", pd); return mv; } - - - /** * 列表 @@ -508,9 +513,9 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("userId", userId); - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/set_question"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_set_question"); } mv.addObject("pd", pd); @@ -547,7 +552,7 @@ public class TeacherController extends BaseController { mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限 return mv; } - + /** * 列表 * @@ -563,18 +568,18 @@ public class TeacherController extends BaseController { page.setPd(pd); page.setLangIsChina(isChineseLanguageClient()); List varList = teacherService.list(page); // 列出Teacher列表 - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/teacher_list2"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_teacher_list2"); } - + mv.addObject("varList", varList); - + mv.addObject("pd", pd); return mv; } - + /** * 列表 * @@ -612,27 +617,24 @@ public class TeacherController extends BaseController { mv.addObject("pd", pd); return mv; } - + @RequestMapping(value = "/goAdd2") public ModelAndView goAdd2() throws Exception { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/teacher_edit2"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_teacher_edit2"); } - - + List schools = schoolService.listAll(pd); mv.addObject("schools", schools); - + List subjects = subjectService.listAllSchool(pd); mv.addObject("subjects", subjects); - - - + mv.addObject("msg", "save2"); mv.addObject("pd", pd); return mv; @@ -657,7 +659,7 @@ public class TeacherController extends BaseController { mv.addObject("pd", pd); return mv; } - + /** * 去修改页面 * @@ -670,9 +672,9 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = teacherService.findById(pd); // 根据ID读取 - if(isChineseLanguageClient()){ + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/teacher_edit2"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_teacher_edit2"); } List schools = schoolService.listAll(pd); @@ -683,7 +685,7 @@ public class TeacherController extends BaseController { mv.addObject("pd", pd); return mv; } - + /** * 去修改页面 * @@ -735,131 +737,149 @@ public class TeacherController extends BaseController { map.put("list", pdList); return AppUtil.returnObject(pd, map); } - - /**打开上传EXCEL页面 + + /** + * 打开上传EXCEL页面 + * * @return * @throws Exception */ - @RequestMapping(value="/goUploadExcel") - public ModelAndView goUploadExcel()throws Exception{ + @RequestMapping(value = "/goUploadExcel") + public ModelAndView goUploadExcel() throws Exception { ModelAndView mv = this.getModelAndView(); mv.addObject("pd", getPageData()); - - if(isChineseLanguageClient()){ + + if (isChineseLanguageClient()) { mv.setViewName("sunvote/teacher/uploadexcel"); - }else{ + } else { mv.setViewName("sunvote/teacher/en_uploadexcel"); } return mv; } - - /**从EXCEL导入到数据库 + /** + * 从EXCEL导入到数据库 + * * @param file * @return * @throws Exception */ - @RequestMapping(value="/readExcel") + @RequestMapping(value = "/readExcel") public ModelAndView readExcel( - @RequestParam(value="excel",required=false) MultipartFile file - ) throws Exception{ - logBefore(logger,Jurisdiction.getUsername() + "从EXCEL导入到数据库"); + @RequestParam(value = "excel", required = false) MultipartFile file) + throws Exception { + logBefore(logger, Jurisdiction.getUsername() + "从EXCEL导入到数据库"); ModelAndView mv = this.getModelAndView(); PageData tpd = getPageData(); PageData pd = new PageData(); - + String schoolID = tpd.getString("SCHOOL_ID"); if (null != file && !file.isEmpty()) { - String filePath = PathUtil.getClasspath() + Const.FILEPATHFILE; //文件上传路径 - String fileName = FileUpload.fileUp(file, filePath, "userexcel"); //执行上传 - List listPd = (List)ObjectExcelRead.readExcel(filePath, fileName, 0, 0, 0); //执行读EXCEL操作,读出的数据导入List 2:从第3行开始；0:从第A列开始；0:第0个sheet - if(listPd.size() > 0 ){ - pd= listPd.get(0); - for(int i = 1 ; i < listPd.size();i++){ + String filePath = PathUtil.getClasspath() + Const.FILEPATHFILE; // 文件上传路径 + String fileName = FileUpload.fileUp(file, filePath, "userexcel"); // 执行上传 + List listPd = (List) ObjectExcelRead.readExcel(filePath, + fileName, 0, 0, 0); // 执行读EXCEL操作,读出的数据导入List + // 2:从第3行开始；0:从第A列开始；0:第0个sheet + if (listPd.size() > 0) { + pd = listPd.get(0); + for (int i = 1; i < listPd.size(); i++) { PageData savePd = new PageData(); PageData temp = listPd.get(i); - for(int j = 0 ; j<9 ;j++){ - if(temp.get("var" + j) == null|| temp.get("var" + j).toString().equals("")){ - if(j==0){ //姓名 - mv.addObject("state","fail"); - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行姓名不能为空"); + for (int j = 0; j < 9; j++) { + if (temp.get("var" + j) == null + || temp.get("var" + j).toString().equals("")) { + if (j == 0) { // 姓名 + mv.addObject("state", "fail"); + mv.addObject("msg", "本次成功导入" + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第" + + i + "行姓名不能为空"); mv.setViewName("save_result2"); return mv; - }else if(j==4){ //账户 - mv.addObject("state","fail"); - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行账户不能为空"); + } else if (j == 4) { // 账户 + mv.addObject("state", "fail"); + mv.addObject("msg", "本次成功导入" + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第" + + i + "行账户不能为空"); mv.setViewName("save_result2"); return mv; - }else if(j==5){ //密码 - savePd.put(pd.getString("var" + j).toUpperCase(), "123456"); - }else if(j==8){ //科目 - mv.addObject("state","fail"); - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行科目不能为空"); + } else if (j == 5) { // 密码 + savePd.put(pd.getString("var" + j) + .toUpperCase(), "123456"); + } else if (j == 8) { // 科目 + mv.addObject("state", "fail"); + mv.addObject("msg", "本次成功导入" + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第" + + i + "行科目不能为空"); mv.setViewName("save_result2"); return mv; } - + } - if(temp.get("var" + j) != null && !"".equals(temp.get("var" + j).toString())){ - savePd.put(pd.getString("var" + j).toUpperCase(), temp.get("var" + j)); + if (temp.get("var" + j) != null + && !"".equals(temp.get("var" + j).toString())) { + savePd.put(pd.getString("var" + j).toUpperCase(), + temp.get("var" + j)); } - + } + savePd.put("PASSWORD", + new SimpleHash("SHA-1", savePd.getString("ACCOUT"), + savePd.getString("PASSWORD")).toString()); // 密码加密 PageData page = subjectService.findByCname(savePd); - if(page!=null){ + if (page != null) { savePd.put("SUBJECT_IDS", page.get("ID")); - }else{ + } else { savePd.put("SUBJECT_IDS", ""); } - if(!savePd.containsKey("ID")){ + if (!savePd.containsKey("ID")) { if (savePd.values().size() > 0) { String teacherId = this.get32UUID(); savePd.put("ID", teacherId); savePd.put("SCHOOL_ID", schoolID); - + PageData p = new PageData(); p.put("USERNAME", savePd.getString("ACCOUT")); - - if(null==userService.findByUsername(p)){ + + if (null == userService.findByUsername(p)) { p.put("USER_ID", savePd.get("ID")); - p.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64"); - p.put("PASSWORD", - new SimpleHash("SHA-1", savePd.getString("ACCOUT"), savePd - .getString("PASSWORD")).toString()); // 密码加密 + p.put("ROLE_ID", + "57bb1e6f138247a0b05cc721a5da1b64"); + p.put("PASSWORD", savePd.getString("PASSWORD") + .toString()); // 密码加密 p.put("LAST_LOGIN", ""); // 最后登录时间 p.put("IP", ""); // IP p.put("STATUS", "0"); // 状态 p.put("SKIN", "default"); p.put("RIGHTS", ""); - p.put("NAME",savePd.getString("NAME") ); - + p.put("NAME", savePd.getString("NAME")); + userService.saveU(p); FHLOG.save(Jurisdiction.getUsername(), "新增系统用户：" + pd.getString("USERNAME")); - }else{ - mv.addObject("state","fail"); - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行用户名系统已存在。"); + } else { + mv.addObject("state", "fail"); + mv.addObject("msg", "本次成功导入" + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第" + + i + "行用户名系统已存在。"); mv.setViewName("save_result2"); return mv; } - - - + teacherService.save(savePd); } - - }else{ + + } else { teacherService.edit(savePd); } } - + } } - mv.addObject("msg","success"); + mv.addObject("msg", "success"); mv.setViewName("save_result2"); return mv; } - + /** * 导出到excel * @@ -890,15 +910,26 @@ 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")==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 + 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); @@ -932,24 +963,23 @@ public class TeacherController extends BaseController { PageData pt = new PageData(); pt.put("TEACHER_ID", pageData.get("ID")); // 在任课表中查找老师教哪些班级，然后查出班级信息 - List classInfoList = v1Service - .getTeacherClassInfo(pt); + List classInfoList = v1Service.getTeacherClassInfo(pt); pt.put("ID", pageData.get("SUBJECT_IDS")); - + pageData.put("classInfoList", classInfoList); // 在认可表中查找老师教哪些科目，然后查出科目信息 List subjectList = new ArrayList(); PageData tmpd = subjectService.findById(pt); - if(tmpd != null){ + if (tmpd != null) { tmpd.put("SUBJECT_ID", tmpd.get("ID")); } subjectList.add(tmpd); -// v1Service.getTeacherSubjectInfo(pt); + // v1Service.getTeacherSubjectInfo(pt); // 一个sql语句完成。 pageData.put("subjectList", subjectList); - + pageData.remove("SUBJECT_IDS"); - + PageData eventPd = new PageData(); eventPd.put("EVENT_ID", get32UUID()); eventPd.put("EVENT_NAME", "login"); @@ -966,10 +996,8 @@ public class TeacherController extends BaseController { } else { res.set1Error(); } - + return res.toJson(); } - - }