孙向锦 / SunvoteEducation

Commit c30a0f5f5b98337d317b8f6948a87293cc8a8726

Authored by =
2 parents 3cc65186 fcd1fe57

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

Inline Side-by-side
Showing 7 changed files with 46 additions and 5 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
  View file @c30a0f5
... ... @@ -156,6 +156,7 @@
156 156 </c:choose>
157 157 </tbody>
158 158 </table>
  159 + ${pd }
159 160 <div id="scrollableTable"></div>
160 161 </form>
161 162 </div>
... ...
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @c30a0f5
... ... @@ -278,5 +278,19 @@
278 278 </foreach>
279 279 </delete>
280 280  
  281 +
  282 + <select id="report" parameterType="pd" resultType="pd">
  283 +
  284 + SELECT
  285 + *
  286 + FROM
  287 + sv_homework
  288 + LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
  289 + WHERE
  290 + sv_homework.CLASS_ID = #{CLASS_ID}
  291 + ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
  292 +
  293 + </select>
  294 +
281 295 <!-- fh313596790qq(青苔) -->
282 296 </mapper>
283 297 \ No newline at end of file
... ...
src/com/fh/controller/base/BaseController.java
  View file @c30a0f5
... ... @@ -98,7 +98,7 @@ public class BaseController {
98 98 return role;
99 99 }
100 100  
101   - public String geTeacherID(){
  101 + public String getTeacherID(){
102 102 Session session = Jurisdiction.getSession();
103 103 User user = (User)session.getAttribute(Const.SESSION_USER);
104 104 if(user != null){
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @c30a0f5
... ... @@ -25,6 +25,7 @@ import com.fh.bean.HomeworkQuestion;
25 25 import com.fh.controller.api.ResponseGson;
26 26 import com.fh.controller.base.BaseController;
27 27 import com.fh.entity.Page;
  28 +import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
28 29 import com.fh.service.sunvote.homework.HomeworkManager;
29 30 import com.fh.service.sunvote.homework.HomeworkReportManager;
30 31 import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
... ... @@ -49,6 +50,12 @@ public class HomeworkController extends BaseController {
49 50  
50 51 @Resource(name = "homeworkproblemService")
51 52 private HomeworkProblemManager homeworkproblemService;
  53 +
  54 + @Resource(name="coursemanagementService")
  55 + private CourseManagementManager coursemanagementService;
  56 +
  57 + @Resource(name="homeworkReporService")
  58 + private HomeworkReportManager homeworkReporkService;
52 59  
53 60 /**
54 61 * 保存
... ... @@ -193,7 +200,7 @@ public class HomeworkController extends BaseController {
193 200 pd = this.getPageData();
194 201 pd = homeworkService.findById(pd); // 根据ID读取
195 202 pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
196   - pd.put("TEACHER_ID", geTeacherID());
  203 + pd.put("TEACHER_ID", getTeacherID());
197 204 mv.setViewName("sunvote/homework/homework_edit2");
198 205 mv.addObject("msg", "edit");
199 206 mv.addObject("operation", "edit");
... ... @@ -214,7 +221,7 @@ public class HomeworkController extends BaseController {
214 221 pd = this.getPageData();
215 222 pd = homeworkService.findById(pd); // 根据ID读取
216 223 pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
217   - pd.put("TEACHER_ID", geTeacherID());
  224 + pd.put("TEACHER_ID", getTeacherID());
218 225 mv.setViewName("sunvote/homework/homework_view");
219 226 mv.addObject("msg", "edit");
220 227 mv.addObject("operation", "view");
... ... @@ -235,7 +242,16 @@ public class HomeworkController extends BaseController {
235 242 ModelAndView mv = this.getModelAndView();
236 243 PageData pd = new PageData();
237 244 pd = this.getPageData();
238   -
  245 + pd.put("TEACHER_ID", getTeacherID());
  246 + List<PageData> list = coursemanagementService.listTeacherClass(pd);
  247 + for(PageData ptd : list){
  248 + ptd.put("CLASS_ID", pd.get("ID"));
  249 + ptd.put("TEACHER_ID", pd.get("TEACHER_ID"));
  250 + List<PageData> dataList = homeworkService.listAll(ptd);
  251 + ptd.put("DETAIL", dataList);
  252 + }
  253 + pd.put("CLASS", list);
  254 +
239 255 mv.setViewName("sunvote/homework/homework_report");
240 256 mv.addObject("pd", pd);
241 257 return mv;
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @c30a0f5
... ... @@ -663,7 +663,7 @@ public class TeacherController extends BaseController {
663 663 public Object info() throws Exception {
664 664 PageData pd = this.getPageData();
665 665 ResponseGson<PageData> res = new ResponseGson();
666   - pd.put("ID", this.geTeacherID());
  666 + pd.put("ID", this.getTeacherID());
667 667 PageData pageData = teacherService.findById(pd);
668 668 if (pageData != null && pageData.getString("ID") != null) {
669 669 pageData.put("PASSWORD", "");// 返回参数中不返回密码
... ...
src/com/fh/service/sunvote/homework/HomeworkManager.java
  View file @c30a0f5
... ... @@ -55,6 +55,11 @@ public interface HomeworkManager{
55 55 * @param pd
56 56 * @throws Exception
57 57 */
  58 + public List<PageData> report(PageData pd)throws Exception;
  59 + /**列表(全部)
  60 + * @param pd
  61 + * @throws Exception
  62 + */
58 63 public List<PageData> qlistAll(PageData pd)throws Exception;
59 64  
60 65 /**通过id获取数据
... ...
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
  View file @c30a0f5
... ... @@ -110,6 +110,11 @@ public class HomeworkService implements HomeworkManager{
110 110 public List<PageData> findByCode(PageData pd) throws Exception {
111 111 return (List<PageData>)dao.findForList("HomeworkMapper.findByCode", pd);
112 112 }
  113 +
  114 + @Override
  115 + public List<PageData> report(PageData pd) throws Exception {
  116 + return (List<PageData>)dao.findForList("HomeworkMapper.report", pd);
  117 + }
113 118  
114 119 }
115 120  
... ...