孙向锦 / SunvoteEducation

Commit e930e8ebf38e15a6f2e556ba233df4d4cd89cc5d

Authored by =
2 parents 125613ca 416902b7

Merge branch '中天电子开发' of http://120.78.57.84/Elvis/SunvoteEducation into 中天电子开发

Inline Side-by-side
Showing 13 changed files with 200 additions and 12 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @e930e8e
... ... @@ -83,7 +83,16 @@
83 83 任课管理<span class="right jiao"></span>
84 84 </p>
85 85 <ul class="menu_1">
86   - <li onclick="event.stopPropagation();subject('${SCHOOL_ID}')"><p>科目管理</p></li>
  86 + <li> <p>科目管理</p>
  87 + <ul class="menu_2">
  88 + <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
  89 + <li onclick="event.stopPropagation();subject('${SCHOOL_ID}')">
  90 + <p>${ var.GNAME }</p>
  91 + </li>
  92 + </c:forEach>
  93 + </ul>
  94 + </li>
  95 +
87 96 <li onclick="event.stopPropagation();coursemanager('${SCHOOL_ID}')"><p>任课管理</p></li>
88 97 <li onclick="event.stopPropagation();teacher('${SCHOOL_ID}')"><p>教师管理</p></li>
89 98 </ul>
... ... @@ -242,8 +251,8 @@
242 251 <script type="text/javascript">
243 252  
244 253 var schoolId = '${SCHOOL_ID}';
245   - function subject(school_id){
246   - var path = "../subject/listcs.do?school_id=" + school_id ;
  254 + function subject(school_id,grade_id){
  255 + var path = "../subject/listcs.do?school_id=" + school_id + "&grade_id=" + grade_id ;
247 256 //if($("#mainFrame").attr('src') != (path)){
248 257 $("#mainFrame").attr('src',path);
249 258 window.top.loading.show();
... ...
WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
  View file @e930e8e
... ... @@ -29,6 +29,7 @@
29 29  
30 30 <form action="subject/${msg }.do" name="Form" id="Form" method="post">
31 31 <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
  32 + <input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/>
32 33 <div id="zhongxin" style="padding-top: 13px;">
33 34 <table id="table_report" class="table table-striped table-bordered table-hover">
34 35 <tr>
... ...
resources/mybatis1/api/V1Mapper.xml
  View file @e930e8e
... ... @@ -185,6 +185,7 @@
185 185  
186 186 </select>
187 187  
  188 +
188 189 <!-- 通过admin ID获取科目数据 -->
189 190 <select id="getClassBySchoolAndGradle" parameterType="pd" resultType="pd">
190 191 SELECT
... ...
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @e930e8e
... ... @@ -140,6 +140,43 @@
140 140  
141 141 </select>
142 142  
  143 + <!-- 列表(全部) -->
  144 + <select id="qlistAll" parameterType="pd" resultType="pd">
  145 + select
  146 + CODE,
  147 + NAME,
  148 + SUBJECT_ID,
  149 + CLASS_ID,
  150 + COMPLETE_DATE,
  151 + COMPLETE_COUNT,
  152 + ALL_SCORE,
  153 + TEACHER_ID,
  154 + HOMEWORK_ID
  155 + from
  156 + <include refid="tableName"></include>
  157 + where 1 = 1
  158 + <if test="pd.SUBJECT_ID != null and pd.SUBJECT_ID != ''"><!-- 关键词检索 -->
  159 + and SUBJECT_ID = #{SUBJECT_ID}
  160 + </if>
  161 + <if test="pd.CLASS_ID != null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
  162 + and CLASS_ID = #{CLASS_ID}
  163 + </if>
  164 + <if test="pd.GRADE_ID != null and pd.GRADE_ID != ''"><!-- 关键词检索 -->
  165 + and GRADE_ID = #{GRADE_ID}
  166 + </if>
  167 + <if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
  168 + and SCHOOL_ID = #{SCHOOL_ID}
  169 + </if>
  170 + <if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 -->
  171 + and TEACHER_ID = #{TEACHER_ID}
  172 + </if>
  173 + <if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 -->
  174 + and COMPLETE_DATE &gt; #{COMPLETE_DATE}
  175 + </if>
  176 +
  177 +
  178 + </select>
  179 +
143 180 <!-- 批量删除 -->
144 181 <delete id="deleteAll" parameterType="String">
145 182 delete from
... ...
resources/mybatis1/sunvote/HomeworkProblemMapper.xml
  View file @e930e8e
... ... @@ -18,6 +18,7 @@
18 18 RIGHT_ANSWER,
19 19 SCORE,
20 20 PART_SCORE,
  21 + HOMEWORK_ID,
21 22 HOMEWORKPROBLEM_ID
22 23 </sql>
23 24  
... ... @@ -32,6 +33,7 @@
32 33 #{RIGHT_ANSWER},
33 34 #{SCORE},
34 35 #{PART_SCORE},
  36 + #{HOMEWORK_ID},
35 37 #{HOMEWORKPROBLEM_ID}
36 38 </sql>
37 39  
... ... @@ -68,6 +70,7 @@
68 70 RIGHT_ANSWER = #{RIGHT_ANSWER},
69 71 SCORE = #{SCORE},
70 72 PART_SCORE = #{PART_SCORE},
  73 + HOMEWORK_ID = #{HOMEWORK_ID},
71 74 HOMEWORKPROBLEM_ID = HOMEWORKPROBLEM_ID
72 75 where
73 76 HOMEWORKPROBLEM_ID = #{HOMEWORKPROBLEM_ID}
... ... @@ -110,6 +113,38 @@
110 113 <include refid="tableName"></include>
111 114 </select>
112 115  
  116 + <!-- 列表(全部) -->
  117 + <select id="listHomeworkProblem" parameterType="pd" resultType="pd">
  118 + select
  119 + <include refid="Field"></include>
  120 + from
  121 + <include refid="tableName"></include>
  122 + where 1 = 1
  123 + <if test="pd.HOMEWORK_ID != null and pd.HOMEWORK_ID != ''">
  124 + and HOMEWORK_ID = #{pd.HOMEWORK_ID}
  125 + </if>
  126 + ORDER BY RANK
  127 + </select>
  128 +
  129 + <!-- 列表(全部) -->
  130 + <select id="listProblem" parameterType="pd" resultType="pd">
  131 + select
  132 + <include refid="Field"></include>
  133 + from
  134 + <include refid="tableName"></include>
  135 + where 1 = 1
  136 + <if test="pd.HOMEWORK_ID != null and pd.HOMEWORK_ID != ''">
  137 + and HOMEWORK_ID = #{pd.HOMEWORK_ID}
  138 + </if>
  139 + <if test="pd.P_HOMEWORK_PROBLEM_ID == null or pd.P_HOMEWORK_PROBLEM_ID == ''">
  140 + and P_HOMEWORK_PROBLEM_ID is NULL
  141 + </if>
  142 + <if test="pd.P_HOMEWORK_PROBLEM_ID != null and pd.P_HOMEWORK_PROBLEM_ID != ''">
  143 + and P_HOMEWORK_PROBLEM_ID = #{pd.P_HOMEWORK_PROBLEM_ID}
  144 + </if>
  145 + ORDER BY RANK
  146 + </select>
  147 +
113 148 <!-- 批量删除 -->
114 149 <delete id="deleteAll" parameterType="String">
115 150 delete from
... ...
resources/mybatis1/sunvote/SubjectMapper.xml
  View file @e930e8e
... ... @@ -123,6 +123,9 @@
123 123 <if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''">
124 124 and sv_schoolgradesubject.SCHOOL_ID = #{pd.SCHOOL_ID}
125 125 </if>
  126 + <if test="pd.GRADE_ID != null and pd.GRADE_ID != ''">
  127 + and sv_schoolgradesubject.GRADE_ID = #{pd.GRADE_ID}
  128 + </if>
126 129 </select>
127 130  
128 131 <!-- 添加学校科目，从未添加的科目里面进行添加 -->
... ... @@ -141,6 +144,9 @@
141 144 <if test="SCHOOL_ID != null and SCHOOL_ID != ''">
142 145 and sv_schoolgradesubject.SCHOOL_ID = #{SCHOOL_ID}
143 146 </if>
  147 + <if test="GRADE_ID != null and GRADE_ID != ''">
  148 + and sv_schoolgradesubject.GRADE_ID = #{GRADE_ID}
  149 + </if>
144 150 )
145 151  
146 152 </select>
... ...
src/com/fh/controller/api/V1.java
  View file @e930e8e
... ... @@ -46,6 +46,7 @@ import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
46 46 import com.fh.service.sunvote.event.EventManager;
47 47 import com.fh.service.sunvote.grade.GradeManager;
48 48 import com.fh.service.sunvote.homework.HomeworkManager;
  49 +import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
49 50 import com.fh.service.sunvote.keypad.KeypadManager;
50 51 import com.fh.service.sunvote.keypadcheck.KeypadCheckManager;
51 52 import com.fh.service.sunvote.knowledge.KnowledgeManager;
... ... @@ -190,7 +191,10 @@ public class V1 extends BaseController {
190 191  
191 192 @Resource(name = "cacheService")
192 193 private CacheManager cacheService;
193   -
  194 +
  195 + @Resource(name="homeworkproblemService")
  196 + private HomeworkProblemManager homeworkproblemService;
  197 +
194 198 /**
195 199 * 登录 可以通过账号密码登录、 可以通过教师卡登录
196 200 *
... ... @@ -2809,11 +2813,60 @@ public class V1 extends BaseController {
2809 2813 public String listhomework() throws Exception {
2810 2814 ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
2811 2815 PageData pageData = this.getPageData();
2812   - List<PageData> list = homeworkService.listAll(pageData);
  2816 + List<PageData> list = homeworkService.qlistAll(pageData);
2813 2817 res.setData(list);
2814 2818 return res.toJson();
2815 2819  
2816 2820 }
  2821 +
  2822 + /**
  2823 + * 获取作业详情
  2824 + *
  2825 + * @param id
  2826 + * @return
  2827 + * @throws Exception
  2828 + */
  2829 + @RequestMapping(value = "/homework", produces = "application/json;charset=UTF-8")
  2830 + @ResponseBody
  2831 + public String homework() throws Exception {
  2832 + ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
  2833 + PageData pageData = this.getPageData();
  2834 + List<PageData> list = homeworkproblemService.listProblem(pageData);
  2835 + for(PageData pd : list){
  2836 + if(pd.get("P_HOMEWORK_PROBLEM_ID") != null){
  2837 + List<PageData> childList = homeworkproblemService.listProblem(pd);
  2838 + pd.put("PROBLEMS", childList);
  2839 + }
  2840 +
  2841 + }
  2842 + res.setData(list);
  2843 + return res.toJson();
  2844 +
  2845 + }
  2846 +
  2847 + /**
  2848 + * 获取作业详情
  2849 + *
  2850 + * @param id
  2851 + * @return
  2852 + * @throws Exception
  2853 + */
  2854 + @RequestMapping(value = "/uploadhomework", produces = "application/json;charset=UTF-8")
  2855 + @ResponseBody
  2856 + public String uploadhomework() throws Exception {
  2857 + ResponseGson<String> res = new ResponseGson<String>();
  2858 +
  2859 + PageData pd = this.getPageData();
  2860 + if (!StringUtils.isEmpty(pd.getJsonString())) {
  2861 +
  2862 +
  2863 +
  2864 + res.setData("success");
  2865 + }
  2866 + res.setDataError();
  2867 + return res.toJson();
  2868 +
  2869 + }
2817 2870  
2818 2871 /**
2819 2872 * 根据ID班级名称
... ...
src/com/fh/controller/sunvote/grade/GradeController.java
  View file @e930e8e
... ... @@ -8,7 +8,9 @@ import java.util.Date;
8 8 import java.util.HashMap;
9 9 import java.util.List;
10 10 import java.util.Map;
  11 +
11 12 import javax.annotation.Resource;
  13 +
12 14 import org.springframework.beans.propertyeditors.CustomDateEditor;
13 15 import org.springframework.stereotype.Controller;
14 16 import org.springframework.web.bind.WebDataBinder;
... ... @@ -16,14 +18,14 @@ import org.springframework.web.bind.annotation.InitBinder;
16 18 import org.springframework.web.bind.annotation.RequestMapping;
17 19 import org.springframework.web.bind.annotation.ResponseBody;
18 20 import org.springframework.web.servlet.ModelAndView;
  21 +
19 22 import com.fh.controller.base.BaseController;
20 23 import com.fh.entity.Page;
  24 +import com.fh.service.sunvote.grade.GradeManager;
21 25 import com.fh.util.AppUtil;
  26 +import com.fh.util.Jurisdiction;
22 27 import com.fh.util.ObjectExcelView;
23 28 import com.fh.util.PageData;
24   -import com.fh.util.Jurisdiction;
25   -import com.fh.util.Tools;
26   -import com.fh.service.sunvote.grade.GradeManager;
27 29  
28 30 /**
29 31 * 说明：年级
... ...
src/com/fh/controller/system/login/LoginController.java
  View file @e930e8e
... ... @@ -296,6 +296,7 @@ public class LoginController extends BaseController {
296 296 List<PageData> gradeInfos = new ArrayList<PageData>();
297 297 List<PageData> subjectInfos = new ArrayList<PageData>();
298 298 // 查询学校信息
  299 + Object tgradleId = "" ;
299 300 for(PageData pad : adminInfos){
300 301 PageData tmpd = new PageData();
301 302 Object gradeId = pad.get("GRADE_ID");
... ... @@ -305,13 +306,15 @@ public class LoginController extends BaseController {
305 306 tmpd.put("GNAME", pad.get("GNAME"));//年级名称
306 307 tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id
307 308 tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称
308   - if(gradeId != null && !"".equals(gradeId)){
  309 + if(gradeId != null && !gradeId.equals(tgradleId)){
  310 + tgradleId = gradeId ;
309 311 List<PageData> classInfos = sclassService.listAll(tmpd);
310 312 tmpd.put("classInfos", classInfos);
311 313 gradeInfos.add(tmpd);
312   - }else{
313   - subjectInfos.add(tmpd);
  314 + subjectInfos = new ArrayList<PageData>();
  315 + tmpd.put("subjectInfos", subjectInfos);
314 316 }
  317 + subjectInfos.add(tmpd);
315 318 schoolId = pad.getString("SCHOOL_ID");
316 319 mv.addObject("SNAME", pad.get("SNAME"));
317 320 mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID"));
... ... @@ -319,7 +322,6 @@ public class LoginController extends BaseController {
319 322 session.setAttribute(USERNAME + Const.ROLE_ID,
320 323 "admin");
321 324 mv.addObject("gradeInfos", gradeInfos);
322   - mv.addObject("subjectInfos", subjectInfos);
323 325 session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
324 326 if(isChineseLanguageClient()){
325 327 mv.setViewName("sunvote/admin/admin_main");
... ...
src/com/fh/service/sunvote/homework/HomeworkManager.java
  View file @e930e8e
... ... @@ -41,6 +41,11 @@ public interface HomeworkManager{
41 41 * @throws Exception
42 42 */
43 43 public List<PageData> listAll(PageData pd)throws Exception;
  44 + /**列表(全部)
  45 + * @param pd
  46 + * @throws Exception
  47 + */
  48 + public List<PageData> qlistAll(PageData pd)throws Exception;
44 49  
45 50 /**通过id获取数据
46 51 * @param pd
... ...
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
  View file @e930e8e
... ... @@ -62,6 +62,15 @@ public class HomeworkService implements HomeworkManager{
62 62 return (List<PageData>)dao.findForList("HomeworkMapper.listAll", pd);
63 63 }
64 64  
  65 + /**列表(全部)
  66 + * @param pd
  67 + * @throws Exception
  68 + */
  69 + @SuppressWarnings("unchecked")
  70 + public List<PageData> qlistAll(PageData pd)throws Exception{
  71 + return (List<PageData>)dao.findForList("HomeworkMapper.listAll", pd);
  72 + }
  73 +
65 74 /**通过id获取数据
66 75 * @param pd
67 76 * @throws Exception
... ...
src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
  View file @e930e8e
... ... @@ -42,6 +42,17 @@ public interface HomeworkProblemManager{
42 42 */
43 43 public List<PageData> listAll(PageData pd)throws Exception;
44 44  
  45 + /**列表(全部)
  46 + * @param pd
  47 + * @throws Exception
  48 + */
  49 + public List<PageData> listHomeworkProblem(PageData pd)throws Exception;
  50 + /**列表(全部)
  51 + * @param pd
  52 + * @throws Exception
  53 + */
  54 + public List<PageData> listProblem(PageData pd)throws Exception;
  55 +
45 56 /**通过id获取数据
46 57 * @param pd
47 58 * @throws Exception
... ...
src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
  View file @e930e8e
... ... @@ -62,6 +62,23 @@ public class HomeworkProblemService implements HomeworkProblemManager{
62 62 return (List<PageData>)dao.findForList("HomeworkProblemMapper.listAll", pd);
63 63 }
64 64  
  65 + /**列表(全部)
  66 + * @param pd
  67 + * @throws Exception
  68 + */
  69 + @SuppressWarnings("unchecked")
  70 + public List<PageData> listHomeworkProblem(PageData pd)throws Exception{
  71 + return (List<PageData>)dao.findForList("HomeworkProblemMapper.listHomeworkProblem", pd);
  72 + }
  73 + /**列表(全部)
  74 + * @param pd
  75 + * @throws Exception
  76 + */
  77 + @SuppressWarnings("unchecked")
  78 + public List<PageData> listProblem(PageData pd)throws Exception{
  79 + return (List<PageData>)dao.findForList("HomeworkProblemMapper.listProblem", pd);
  80 + }
  81 +
65 82 /**通过id获取数据
66 83 * @param pd
67 84 * @throws Exception
... ...