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

=
2 parents 6ef63c2d 5162dcee
Showing 8 changed files with 266 additions and 15 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
resources/mybatis1/sunvote/HomeworkMapper.xml
resources/mybatis1/sunvote/HomeworkProblemMapper.xml
src/com/fh/bean/HomeClass.java
src/com/fh/bean/Homework.java
src/com/fh/bean/HomeworkQuestion.java
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -23,7 +23,8 @@
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
-	<form action="../paper/list2.do" method="post" name="Form" id="Form">
+	<form action="homework/list.do" method="post" name="Form" id="Form">
+		<input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/>
 		<div class="head_box">
 		<div class="box_header">
 			<div class="head_box_l">
@@ -37,9 +38,9 @@
 					<option value="1">完成</option>
 					<option value="2">未完成</option>
 				</select>
-				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
-				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
-				 <a href="#" onclick="tosearch();"><img
+				<input class="date-picker" type="text" placeholder="开始日期" name="StartDate" id="StartDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.STARTDATE }"/> 
+				<input type="text" class="date-picker" placeholder="结束日期" name="EndDate" name="EndDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.ENDDATE}"/>
+				 <a onclick="tosearch();"><img
 					src="static/images/search.png" /></a>
 			</div>
 			<div class="clear"></div>
@@ -85,14 +86,14 @@
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
 								<td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td>
-								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.HOMEWORK_ID}">${var.NAME}</a></td>
+								<td ><a  target="_blank" href="<%=basePath%>homework/iteminfo.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td>
 								<td >${var.CREATE_DATE}</td>
 								<td >${var.COMPLETE_DATE}</td>
 								<td >${var.QUESTIOM_COUNT}</td>
 								<td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td>
 								<td >${var.ALL_SCORE}</td>
 								<td>
-								<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
+								<a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
 								<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a>
 								</td>
 							</tr>
@@ -110,7 +111,7 @@
 			</table>
 			<div class="footer">
 				<div class="creat">
-					<input type="button"  onclick="edit()" value="布置练习" />
+					<input type="button"  onclick="add()" value="布置练习" />
 				</div>
 				<div class="removeAll">
 					<input type="button" onclick="deleteAll()" value="批量删除" />
@@ -145,6 +146,10 @@
 			todayHighlight: true
 		});
 	});
+	
+	function tosearch(){
+		$("#Form").submit();
+	}
 	function edit(Id){
 		window.top.modal.init({
 		'title':'布置练习',
@@ -155,8 +155,14 @@
 		<if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 -->
 			and TEACHER_ID = #{pd.TEACHER_ID}
 		</if>
-		<if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 -->
-			and COMPLETE_DATE &gt; #{pd.COMPLETE_DATE}
+		<if test="pd.COMPLETE_DATE != null and pd.COMPLETE_DATE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE = #{pd.COMPLETE_DATE}
+		</if>
+		<if test="pd.STARTDATE != null and pd.STARTDATE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE &gt; #{pd.STARTDATE}
+		</if>
+		<if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE &lt; #{pd.ENDDATE}
 		</if>
 	</select>
@@ -137,8 +137,8 @@
 		from 
 		<include refid="tableName"></include>
 		where 1 = 1
-		<if test="HOMEWORK_ID != null and HOMEWORK_ID != ''">
-			and	HOMEWORK_ID = #{HOMEWORK_ID}
+		<if test="CODE != null and CODE != ''">
+			and	CODE = #{CODE}
 		</if>
 		<if test="P_HOMEWORK_PROBLEM_ID == null or P_HOMEWORK_PROBLEM_ID == ''">
 			and	P_HOMEWORK_PROBLEM_ID is NULL
+package com.fh.bean;
+
+public class HomeClass {
+
+	private String CLASS_ID;
+    private String COMPLETE_DATE;
+    public void setCLASS_ID(String CLASS_ID) {
+         this.CLASS_ID = CLASS_ID;
+     }
+     public String getCLASS_ID() {
+         return CLASS_ID;
+     }
+
+    public void setCOMPLETE_DATE(String COMPLETE_DATE) {
+         this.COMPLETE_DATE = COMPLETE_DATE;
+     }
+     public String getCOMPLETE_DATE() {
+         return COMPLETE_DATE;
+     }
+}
+package com.fh.bean;
+
+import java.util.List;
+
+import com.google.gson.Gson;
+
+public class Homework {
+
+	private String CODE;
+	private String NAME;
+	private String SUBJECT_ID;
+	private String ALL_SCORE;
+	private String HOMEWORK_DESC;
+	private List<HomeClass> CLASSLIST;
+	private String QUESTION_COUNT;
+	private String TEACHER_ID;
+	private List<HomeworkQuestion> QUESTIOMS;
+
+	public void setCODE(String CODE) {
+		this.CODE = CODE;
+	}
+
+	public String getCODE() {
+		return CODE;
+	}
+
+	public void setNAME(String NAME) {
+		this.NAME = NAME;
+	}
+
+	public String getNAME() {
+		return NAME;
+	}
+
+	public void setSUBJECT_ID(String SUBJECT_ID) {
+		this.SUBJECT_ID = SUBJECT_ID;
+	}
+
+	public String getSUBJECT_ID() {
+		return SUBJECT_ID;
+	}
+
+	public void setALL_SCORE(String ALL_SCORE) {
+		this.ALL_SCORE = ALL_SCORE;
+	}
+
+	public String getALL_SCORE() {
+		return ALL_SCORE;
+	}
+
+	public void setHOMEWORK_DESC(String HOMEWORK_DESC) {
+		this.HOMEWORK_DESC = HOMEWORK_DESC;
+	}
+
+	public String getHOMEWORK_DESC() {
+		return HOMEWORK_DESC;
+	}
+
+	public void setCLASSLIST(List<HomeClass> CLASSLIST) {
+		this.CLASSLIST = CLASSLIST;
+	}
+
+	public List<HomeClass> getCLASSLIST() {
+		return CLASSLIST;
+	}
+
+	public void setQUESTIOM_COUNT(String QUESTIOM_COUNT) {
+		this.QUESTION_COUNT = QUESTIOM_COUNT;
+	}
+
+	public String getQUESTION_COUNT() {
+		return QUESTION_COUNT;
+	}
+
+	public void setQUESTIOMS(List<HomeworkQuestion> QUESTIOMS) {
+		this.QUESTIOMS = QUESTIOMS;
+	}
+
+	public List<HomeworkQuestion> getQUESTIOMS() {
+		return QUESTIOMS;
+	}
+
+	
+	
+	public String getTEACHER_ID() {
+		return TEACHER_ID;
+	}
+
+	public void setTEACHER_ID(String tEACHER_ID) {
+		TEACHER_ID = tEACHER_ID;
+	}
+
+	public void setQUESTION_COUNT(String qUESTION_COUNT) {
+		QUESTION_COUNT = qUESTION_COUNT;
+	}
+
+	public static Homework parse(String json) {
+		Gson gson = new Gson();
+		return gson.fromJson(json, Homework.class);
+	}
+}
+package com.fh.bean;
+
+public class HomeworkQuestion {
+
+	private String RANK;
+	private String NAME;
+	private String OPTION_NUM;
+	private String SCORE;
+	private String RIGHT_ANSWER;
+	private String TYPE;
+
+	public void setRANK(String RANK) {
+		this.RANK = RANK;
+	}
+
+	public String getRANK() {
+		return RANK;
+	}
+
+	public void setNAME(String NAME) {
+		this.NAME = NAME;
+	}
+
+	public String getNAME() {
+		return NAME;
+	}
+
+	public void setOPTION_NUM(String OPTION_NUM) {
+		this.OPTION_NUM = OPTION_NUM;
+	}
+
+	public String getOPTION_NUM() {
+		return OPTION_NUM;
+	}
+
+	public void setSCORE(String SCORE) {
+		this.SCORE = SCORE;
+	}
+
+	public String getSCORE() {
+		return SCORE;
+	}
+
+	public void setRIGHT_ANSWER(String RIGHT_ANSWER) {
+		this.RIGHT_ANSWER = RIGHT_ANSWER;
+	}
+
+	public String getRIGHT_ANSWER() {
+		return RIGHT_ANSWER;
+	}
+
+	public void setTYPE(String TYPE) {
+		this.TYPE = TYPE;
+	}
+
+	public String getTYPE() {
+		return TYPE;
+	}
+
+}
@@ -2851,6 +2851,7 @@ public class V1 extends BaseController {
 	public String homework() throws Exception {
 		ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
 		PageData pageData = this.getPageData();
+		pageData.put("CODE", pageData.get("HOMEWORK_ID"));
 		List<PageData> list = homeworkproblemService.listProblem(pageData);
 		for(PageData pd : list){
 			if(pd.get("P_HOMEWORK_PROBLEM_ID") != null){
@@ -19,11 +19,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+import com.fh.bean.HomeClass;
+import com.fh.bean.Homework;
+import com.fh.bean.HomeworkQuestion;
 import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.service.sunvote.homework.HomeworkManager;
 import com.fh.service.sunvote.homework.HomeworkReportManager;
+import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
 import com.fh.util.AppUtil;
 import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
@@ -42,6 +46,9 @@ public class HomeworkController extends BaseController {
 	private HomeworkManager homeworkService;
 	@Resource(name = "homeworkReporService")
 	private HomeworkReportManager homeworkReporService;
+	
+	@Resource(name="homeworkproblemService")
+	private HomeworkProblemManager homeworkproblemService;
 	/**
 	 * 保存
@@ -155,6 +162,7 @@ public class HomeworkController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+
 	/**
 	 * 去修改页面
 	 * 
@@ -278,7 +286,7 @@ public class HomeworkController extends BaseController {
 		Gson gson = new Gson();
 		return gson.toJson(pd);
 	}
-	
+
 	/**
 	 * 列表
 	 * 
@@ -299,15 +307,65 @@ public class HomeworkController extends BaseController {
 		Gson gson = new Gson();
 		return gson.toJson(varList);
 	}
-	
-	@RequestMapping(value = "/savedata")
+
+	@RequestMapping(value = "/savedata", produces = "application/json;charset=UTF-8")
+	@ResponseBody
 	public String savedata() throws Exception {
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		pd.put("HOMEWORK_ID", this.get32UUID()); // 主键
+		pd.put("HOMEWORK_ID", this.get32UUID());
 		homeworkService.save(pd);
 		ResponseGson<String> responseGson = new ResponseGson<String>();
 		responseGson.setData(pd.getString("HOMEWORK_ID"));
 		return responseGson.toJson();
 	}
+	
+	@RequestMapping(value = "/uploadHomework", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String uploadHomework() throws Exception {
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		String data = pd.getJsonString();
+		ResponseGson<String> responseGson = new ResponseGson<String>();
+		
+		Homework homework = Homework.parse(data);
+		
+		PageData hpd = new PageData();
+		hpd.put("CODE", get32UUID());
+		hpd.put("NAME", homework.getNAME());
+		hpd.put("SUBJECT_ID", homework.getSUBJECT_ID());
+		hpd.put("ALL_SCORE", homework.getALL_SCORE());
+		hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC());
+		hpd.put("QUESTION_COUNT", homework.getQUESTION_COUNT());
+		hpd.put("CREATE_DATE", format.format(new Date()));
+		hpd.put("MODIFY_DATE", format.format(new Date()));
+		hpd.put("COMPLETE_COUNT", 0);
+		hpd.put("TEACHER_ID", homework.getTEACHER_ID());
+		hpd.put("COMPLETE_DESC", "");
+		
+		for(HomeClass homeclass : homework.getCLASSLIST()){
+			hpd.put("CLASS_ID", homeclass.getCLASS_ID());
+			hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE());
+			hpd.put("HOMEWORK_ID", this.get32UUID());
+			homeworkService.save(hpd);
+		}
+		
+		for(HomeworkQuestion homeworkQuestion:homework.getQUESTIOMS()){
+			PageData qpd = new PageData();
+			qpd.put("RANK", homeworkQuestion.getRANK());
+			qpd.put("CODE", hpd.get("CODE"));
+			qpd.put("NAME", homeworkQuestion.getNAME());
+			qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM());
+			qpd.put("SCORE", homeworkQuestion.getSCORE());
+			qpd.put("RIGHT_ANSWER", homeworkQuestion.getRIGHT_ANSWER());
+			qpd.put("TYPE", homeworkQuestion.getTYPE());
+			qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID());
+			qpd.put("HOMEWORK_ID", hpd.get("CODE"));
+			homeworkproblemService.save(qpd);
+		}
+		
+		responseGson.setData(pd.getString("CODE"));
+		return responseGson.toJson();
+	}
 }