修复接口中的bug

孙向锦
1 parent 91a745c9
Showing 9 changed files with 227 additions and 23 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
resources/mybatis1/api/V1Mapper.xml
resources/mybatis1/sunvote/PaperMapper.xml
resources/mybatis1/sunvote/SClassMapper.xml
resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml
src/com/fh/bean/Question.java
src/com/fh/controller/api/V1.java
src/com/fh/service/sunvote/schoolgradesubject/SchoolGradeSubjectManager.java
src/com/fh/service/sunvote/schoolgradesubject/impl/SchoolGradeSubjectService.java
@@ -170,7 +170,7 @@
 	    <div class="modal-content">
 	      <div class="modal-header">
 	        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	        <h4 class="modal-title">考试时间</h4>
+	        <h4 class="modal-title">新建试卷</h4>
 	      </div>
 	      <div class="modal-body">
 	        <div class="form-group">
@@ -35,6 +35,11 @@
 		SELECT
 			STUDENT_ID,
 			sv_student.`NAME`,
+			sv_student.`SNO`,
+			sv_student.`NUMBER`,
+			sv_student.`GROUPID`,
+			sv_student.`SIGN_NO`,
+			sv_student.`SEX`,
 			sv_student.`KEYPAD_ID`
 			FROM
 				sv_classroster
@@ -76,8 +81,8 @@
 	<select id="getTestPaperInfo" parameterType="pd" resultType="pd">
 		 	SELECT
 			sv_question.OPTION_NUM,
-			sv_paperquestion.SCORE,
 			sv_paperquestion.PART_SCORE,
+			sv_paperquestion.SCORE,
 			sv_paperquestion.RANK,
 			sv_paperquestion.NO_NAME,
 			sv_question.ANALYSIS,
@@ -86,6 +91,7 @@
 			sv_question.CONTENT,
 			sv_question.ANSWER,
 			sv_question.OPTION_CONTENT,
+			sv_question.PROBLEM_TYPE_ID,
 			sv_question.P_ID
 			FROM
 				sv_paperquestion
@@ -110,6 +116,7 @@
 			sv_question.DIFFICULTY,
 			sv_question.QUESTION_ID,
 			sv_question.CONTENT,
+			sv_question.PROBLEM_TYPE_ID,
 			sv_question.ANSWER,
 			sv_question.OPTION_CONTENT
 			FROM
@@ -21,6 +21,7 @@
 		PAPER_STATE,	
 		REMARK,	
 		SCORE,	
+		QUESTION_NUM,	
 		PAPER_ID
 	</sql>
  
@@ -38,6 +39,7 @@
 		#{PAPER_STATE},	
 		#{REMARK},	
 		#{SCORE},	
+		#{QUESTION_NUM},	
 		#{PAPER_ID}
 	</sql>
  
@@ -77,6 +79,7 @@
 			PAPER_STATE = #{PAPER_STATE},
 			REMARK = #{REMARK},
 			SCORE = #{SCORE},
+			QUESTION_NUM = #{QUESTION_NUM},
 		PAPER_ID = PAPER_ID
 		where 
 		PAPER_ID = #{PAPER_ID}
@@ -91,15 +91,14 @@
 		from 
 		<include refid="tableName"></include>
 		where 1=1
-		<if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
-			and
-				(
-				<!--	根据需求自己加检索条件
-					字段1 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-					 or 
-					字段2 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%') 
-				-->
-				)
+		<if test="SCHOOL_ID != null and SCHOOL_ID != ''">
+			and ( SCHOOL_ID = #{SCHOOL_ID} )
+		</if>
+		<if test="GRADE_ID != null and GRADE_ID != ''">
+			and ( GRADE_ID = #{GRADE_ID} )
+		</if>
+		<if test="CLASS_TYPE != null and CLASS_TYPE != ''">
+			and ( CLASS_TYPE = #{CLASS_TYPE} )
 		</if>
 	</select>
  
@@ -109,6 +108,17 @@
 		<include refid="Field"></include>
 		from 
 		<include refid="tableName"></include>
+		where 1=1
+		<if test="SCHOOL_ID != null and SCHOOL_ID != ''">
+			and ( SCHOOL_ID = #{SCHOOL_ID} )
+		</if>
+		<if test="GRADE_ID != null and GRADE_ID != ''">
+			and ( GRADE_ID = #{GRADE_ID} )
+		</if>
+		<if test="CLASS_TYPE != null and CLASS_TYPE != ''">
+			and ( CLASS_TYPE = #{CLASS_TYPE} )
+		</if>
+		
 	</select>
  
 	<!-- 批量删除 -->
@@ -90,6 +90,55 @@
 		<include refid="Field"></include>
 		from 
 		<include refid="tableName"></include>
+		where 1=1
+		
+		<if test=" SCHOOL_ID != null and SCHOOL_ID != ''">
+			and ( SCHOOL_ID = #{SCHOOL_ID} )
+		</if>
+		<if test=" GRADE_ID != null and GRADE_ID != ''">
+			and ( GRADE_ID = #{GRADE_ID} )
+		</if>
+		<if test=" SUBJECT_ID != null and SUBJECT_ID != ''">
+			and ( SUBJECT_ID = #{SUBJECT_ID} )
+		</if>
+		
+	</select>
+	
+	<!-- 列表(所有年级) -->
+	<select id="listAllGrade" parameterType="pd" resultType="pd">
+		select
+		SV_GRADE.NAME,SV_GRADE.DESC,REMARK,ID
+		from 
+		SV_SCHOOLGRADESUBJECT inner join SV_GRADE on SV_SCHOOLGRADESUBJECT.GRADE_ID = SV_GRADE.ID
+		where 1=1
+		
+		<if test=" SCHOOL_ID != null and SCHOOL_ID != ''">
+			and ( SCHOOL_ID = #{SCHOOL_ID} )
+		</if>
+		
+		group by GRADE_ID
+	</select>
+	
+	<!-- 列表(所有科目) -->
+	<select id="listAllSubject" parameterType="pd" resultType="pd">
+		select
+		SV_SUBJECT.CNAME,	
+		SV_SUBJECT.ENAME,	
+		SV_SUBJECT.REMARK,	
+		SV_SUBJECT.ID
+		from 
+		SV_SCHOOLGRADESUBJECT inner join SV_SUBJECT on SV_SCHOOLGRADESUBJECT.SUBJECT_ID = SV_SUBJECT.ID
+		where 1=1
+		<if test=" SCHOOL_ID != null and SCHOOL_ID != ''">
+			and ( SCHOOL_ID = #{SCHOOL_ID} )
+		</if>
+		
+		<if test=" GRADE_ID != null and GRADE_ID != ''">
+			and ( GRADE_ID = #{GRADE_ID} )
+		</if>
+		
+		group by SUBJECT_ID
+	
 	</select>
  
 	<!-- 批量删除 -->
@@ -41,6 +41,8 @@ public class Question {
 	private String sug_score;
  
 	private String sug_part_score;
+	
+	private String questionType = "" ;
  
 	private List<Question> questions;
  
@@ -204,4 +206,13 @@ public class Question {
 		return this.questions;
 	}
  
+	public String getQuestionType() {
+		return questionType;
+	}
+
+	public void setQuestionType(String questionType) {
+		this.questionType = questionType;
+	}
+
+	
 }
@@ -186,8 +186,8 @@ public class V1 extends BaseController {
 	@ResponseBody
 	public Object sclass() throws Exception {
 		PageData pd = this.getPageData();
-		ResponseGson<PageData> res = new ResponseGson();
 		if (pd.containsKey("ID")) {
+			ResponseGson<PageData> res = new ResponseGson();
 			PageData pageData = sclassService.findById(pd);
 			if (pageData != null && pageData.containsKey("ID")) {
 				PageData pt = new PageData();
@@ -198,11 +198,67 @@ public class V1 extends BaseController {
 			} else {
 				res.set2Error();
 			}
+			return res.toJson();
+		} else {
+			ResponseGson<List<PageData>> res = new ResponseGson();
+			List<PageData> list = sclassService.listAll(pd);
+			res.setData(list);
+			return res.toJson();
+			
+		}
+	}
+	
+	@RequestMapping(value = "/questiontype", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object questiontype() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<List<PageData>> res = new ResponseGson();
+		List<PageData> list = questiontypeService.listAll(pd);
+		res.setData(list);
+		return res.toJson();
+	}
+	
+	@RequestMapping(value = "/classtype", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object classtype() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<List<PageData>> res = new ResponseGson();
+		List<PageData> list = classtypeService.listAll(pd);
+		res.setData(list);
+		return res.toJson();
+	}
+	
+	@RequestMapping(value = "/grade", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object grade() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<List<PageData>> res = new ResponseGson();
+		if (!pd.containsKey("SCHOOL_ID")) {
+			List<PageData> list = gradeService.listAll(pd);
+			res.setData(list);
 		} else {
-			res.set2Error();
+			List<PageData> list = schoolgradesubjectService.listAllGrade(pd);
+			res.setData(list);
 		}
 		return res.toJson();
 	}
+	
+	@RequestMapping(value = "/subject", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object subject() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<List<PageData>> res = new ResponseGson();
+		if (!pd.containsKey("SCHOOL_ID")) {
+			List<PageData> list = subjectService.listAll(pd);
+			res.setData(list);
+		} else {
+			List<PageData> list = schoolgradesubjectService.listAllSubject(pd);
+			res.setData(list);
+		}
+		return res.toJson();
+	}
+	
+	
  
 	@RequestMapping(value = "/keypadscan", produces = "application/json;charset=UTF-8")
 	@ResponseBody
@@ -296,9 +352,10 @@ public class V1 extends BaseController {
 							question.setAnalysis(qpd.getString("ANALYSIS"));
 							question.setQuestion_from(qpd
 									.getString("QUESTION_FROM"));
-							question.setSug_score(qpd.getString("SUG_SCORE"));
-							question.setSug_part_score(qpd
-									.getString("SUG_PART_SCORE"));
+							question.setScore(qpd.getString("SCORE"));
+							question.setPart_score(qpd
+									.getString("PART_SCORE"));
+							question.setQuestionType(qpd.getString("PROBLEM_TYPE_ID"));
 							question.setRank(qpd.getString("RANK"));
 							question.setNo_name(qpd.getString("NO_NAME"));
 							if ("-1".equals("" + qpd.getString("P_ID"))) {
@@ -326,9 +383,10 @@ public class V1 extends BaseController {
 									qq.setAnalysis(q.getString("ANALYSIS"));
 									qq.setQuestion_from(q
 											.getString("QUESTION_FROM"));
-									qq.setSug_score(q.getString("SUG_SCORE"));
-									qq.setSug_part_score(q
-											.getString("SUG_PART_SCORE"));
+									qq.setScore(q.getString("SCORE"));
+									qq.setPart_score(q
+											.getString("PART_SCORE"));
+									qq.setQuestionType(qpd.getString("PROBLEM_TYPE_ID"));
 									qq.setRank(q.getString("RANK"));
 									qq.setNo_name(q.getString("NO_NAME"));
 									question.getQuestions().add(qq);
@@ -365,7 +423,32 @@ public class V1 extends BaseController {
  
 		return res.toJson();
 	}
-
+	
+	@RequestMapping(value = "/question", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object question() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		if(pd.containsKey("ID")){
+			pd.put("QUESTION_ID", pd.get("ID"));
+			PageData data = questionService.findById(pd);
+			res.setData(data);
+		}else{
+			res.setDataError();
+		}
+		return res.toJson();
+	}
+	
+	@RequestMapping(value = "/question/add", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object questionAdd() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		pd.put("QUESTION_ID", this.get32UUID());
+		questionService.save(pd);
+		return res.toJson();
+	}
+	
 	@RequestMapping(value = "/uploadpaper", produces = "application/json;charset=UTF-8")
 	@ResponseBody
 	public Object uploadpaper() throws Exception {
@@ -373,6 +456,7 @@ public class V1 extends BaseController {
 		ResponseGson<String> res = new ResponseGson();
  
 		if (!StringUtils.isEmpty(pd.getJsonString())) {
+			logger.info(pd.getJsonString());
 			Paper paper = Paper.parse(pd.getJsonString());
 			PageData paperPd = new PageData();
 			String paperID = this.get32UUID();
@@ -392,7 +476,8 @@ public class V1 extends BaseController {
 			paperPd.put("CREATE_DATE", Tools.date2Str(new Date()));
 			paperPd.put("MODIFY_DATE", Tools.date2Str(new Date()));
  
-			paperService.save(paperPd);
+			int questionNum = 0 ;
+			
  
 			List<Question> questions = paper.getQuestions();
 			if (questions != null) {
@@ -404,11 +489,12 @@ public class V1 extends BaseController {
 							&& question.getQuestions().size() > 0) {
 						qPd.put("P_ID", "-1");
 					} else {
+						questionNum ++ ;
 						qPd.put("P_ID", "0");
 					}
 					qPd.put("SUBJECT_ID", paper.getSubject_id());
 					qPd.put("CHAPTER_ID", question.getChapter_id());
-					qPd.put("PROBLEM_TYPE_ID", question.getProblem_type_id());
+					qPd.put("PROBLEM_TYPE_ID", question.getProblem_type_id() == null ? "1" :  question.getProblem_type_id());
 					qPd.put("TEACHER_ID", paper.getUser_id());
 					qPd.put("SCHOOL_ID", schoolID);
 					qPd.put("KNOWLEDGE_ID", question.getKnowledge_id());
@@ -445,7 +531,7 @@ public class V1 extends BaseController {
 							cqPd.put("P_ID", questionID);
 							cqPd.put("SUBJECT_ID", paper.getSubject_id());
 							cqPd.put("CHAPTER_ID", q.getChapter_id());
-							cqPd.put("PROBLEM_TYPE_ID", q.getProblem_type_id());
+							cqPd.put("PROBLEM_TYPE_ID", question.getProblem_type_id() == null ? "1" :  question.getProblem_type_id());
 							cqPd.put("TEACHER_ID", paper.getUser_id());
 							cqPd.put("SCHOOL_ID", schoolID);
 							cqPd.put("KNOWLEDGE_ID", q.getKnowledge_id());
@@ -474,10 +560,13 @@ public class V1 extends BaseController {
 							cpqPd.put("PAPERQUESTION_ID", this.get32UUID());
  
 							paperquestionService.save(cpqPd);
+							questionNum ++ ;
 						}
 					}
 				}
 			}
+			paperPd.put("QUESTION_NUM", "" + questionNum);
+			paperService.save(paperPd);
  
 		} else {
 			res.setDataError();
@@ -490,9 +579,11 @@ public class V1 extends BaseController {
 	@RequestMapping(value = "/uploadtestpaper", produces = "application/json;charset=UTF-8")
 	@ResponseBody
 	public Object uploadTestpaper() {
+		long cur = System.currentTimeMillis();
 		PageData pd = this.getPageData();
 		ResponseGson<String> res = new ResponseGson();
 		if (!StringUtils.isEmpty(pd.getJsonString())) {
+			logger.info(pd.getJsonString());
 			TestPaper testPaper = TestPaper.parse(pd.getJsonString());
 			try {
 				PageData testPd = new PageData();
@@ -576,6 +667,7 @@ public class V1 extends BaseController {
 		} else {
 			res.setDataError();
 		}
+		logger.info("uploadtestpaper cost time:" + (System.currentTimeMillis() - cur));
  
 		return res.toJson();
  
@@ -704,4 +796,15 @@ public class V1 extends BaseController {
 		return res.toJson();
  
 	}
+	
+	
+	@RequestMapping(value = "/schooladmin", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public void schoolAdmin(){
+		PageData pd = this.getPageData();
+		this.getUserID();
+		
+		
+	}
+	
 }
 package com.fh.service.sunvote.schoolgradesubject;
  
 import java.util.List;
+
 import com.fh.entity.Page;
 import com.fh.util.PageData;
  
@@ -53,5 +54,9 @@ public interface SchoolGradeSubjectManager{
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
  
+	public List<PageData> listAllGrade(PageData pd)throws Exception;
+	
+	public List<PageData> listAllSubject(PageData pd)throws Exception;
+	
 }
  
@@ -60,6 +60,22 @@ public class SchoolGradeSubjectService implements SchoolGradeSubjectManager{
 	public List<PageData> listAll(PageData pd)throws Exception{
 		return (List<PageData>)dao.findForList("SchoolGradeSubjectMapper.listAll", pd);
 	}
+	/**列表(年级)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllGrade(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("SchoolGradeSubjectMapper.listAllGrade", pd);
+	}
+	/**列表(科目)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllSubject(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("SchoolGradeSubjectMapper.listAllSubject", pd);
+	}
  
 	/**通过id获取数据
 	 * @param pd