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

=
2 parents 68088573 2c6bc93d
Showing 8 changed files with 147 additions and 3 deletions
resources/mybatis1/sunvote/HomeworkMapper.xml
resources/mybatis1/sunvote/HomeworkProblemMapper.xml
src/com/fh/bean/Homework.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/service/sunvote/homework/HomeworkManager.java
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
@@ -133,6 +133,16 @@
 			HOMEWORK_ID = #{HOMEWORK_ID}
 	</select>
  
+	<!-- 通过ID获取数据 -->
+	<select id="findByCode" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			CODE = #{CODE}
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
@@ -56,6 +56,14 @@
 			HOMEWORKPROBLEM_ID = #{HOMEWORKPROBLEM_ID}
 	</delete>
  
+	<!-- 删除-->
+	<delete id="deleteByCode" parameterType="pd">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			HOMEWORK_ID = #{CODE}
+	</delete>
+	
 	<!-- 修改 -->
 	<update id="edit" parameterType="pd">
 		update
@@ -6,6 +6,7 @@ import com.google.gson.Gson;
  
 public class Homework {
  
+	private String HOMEWORK_ID;
 	private String CODE;
 	private String NAME;
 	private String SUBJECT_ID;
@@ -72,7 +73,7 @@ public class Homework {
 		return QUESTION_COUNT;
 	}
  
-	public void setQUESTIOMS(List<HomeworkQuestion> QUESTIOMS) {
+	public void setQUESTIONS(List<HomeworkQuestion> QUESTIOMS) {
 		this.QUESTIONS = QUESTIOMS;
 	}
  
@@ -93,6 +94,16 @@ public class Homework {
 	public void setQUESTION_COUNT(String qUESTION_COUNT) {
 		QUESTION_COUNT = qUESTION_COUNT;
 	}
+	
+	
+
+	public String getHOMEWORK_ID() {
+		return HOMEWORK_ID;
+	}
+
+	public void setHOMEWORK_ID(String hOMEWORK_ID) {
+		HOMEWORK_ID = hOMEWORK_ID;
+	}
  
 	public static Homework parse(String json) {
 		Gson gson = new Gson();
@@ -113,7 +113,7 @@ public class HomeworkController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
-		pd = this.getPageData();	
+		pd = this.getPageData();
 		String keywords = pd.getString("keywords"); // 关键词检索条件
 		if (null != keywords && !"".equals(keywords)) {
 			pd.put("keywords", keywords.trim());
@@ -143,7 +143,7 @@ public class HomeworkController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
-	
+
 	/**
 	 * 去新增页面
 	 * 
@@ -398,4 +398,91 @@ public class HomeworkController extends BaseController {
 		}
 		return responseGson.toJson();
 	}
+
+	@RequestMapping(value = "/updateHomework", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String updateHomework() 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();
+		if (homework != null) {
+			if (homework.getHOMEWORK_ID() != null
+					&& !"".equals(homework.getHOMEWORK_ID().trim())) {
+				hpd.put("HOMEWORK_ID", homework.getHOMEWORK_ID());
+				hpd = homeworkService.findById(hpd);
+				if(hpd != null){
+					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", "");
+					if(homeworkService.findByCode(hpd).size() > 1){
+						hpd.put("CODE", get32UUID());
+						for (HomeClass homeclass : homework.getCLASSLIST()) {
+							hpd.put("CLASS_ID", homeclass.getCLASS_ID());
+							hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE());
+							homeworkService.edit(hpd);
+						}
+						for (HomeworkQuestion homeworkQuestion : homework
+								.getQUESTIONS()) {
+							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(hpd.getString("CODE"));
+					}else{
+						for (HomeClass homeclass : homework.getCLASSLIST()) {
+							hpd.put("CLASS_ID", homeclass.getCLASS_ID());
+							hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE());
+							homeworkService.edit(hpd);
+						}
+						homeworkproblemService.deleteByCode(hpd);
+						for (HomeworkQuestion homeworkQuestion : homework
+								.getQUESTIONS()) {
+							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(hpd.getString("CODE"));
+					}
+				}else{
+					responseGson.setDataError();
+				}
+			} else {
+				responseGson.setDataError();
+			}
+		} else {
+			responseGson.setDataError();
+		}
+		return responseGson.toJson();
+	}
 }
@@ -53,6 +53,12 @@ public interface HomeworkManager{
 	 */
 	public PageData findById(PageData pd)throws Exception;
  
+	/**通过code获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> findByCode(PageData pd)throws Exception;
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
 package com.fh.service.sunvote.homework.impl;
  
 import java.util.List;
+
 import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
+
 import com.fh.dao.DaoSupport;
 import com.fh.entity.Page;
 import com.fh.util.PageData;
@@ -86,6 +89,11 @@ public class HomeworkService implements HomeworkManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("HomeworkMapper.deleteAll", ArrayDATA_IDS);
 	}
+
+	@Override
+	public List<PageData> findByCode(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("HomeworkMapper.findByCode", pd);
+	}
  
 }
  
@@ -23,6 +23,11 @@ public interface HomeworkProblemManager{
 	 * @throws Exception
 	 */
 	public void delete(PageData pd)throws Exception;
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteByCode(PageData pd)throws Exception;
  
 	/**修改
 	 * @param pd
 package com.fh.service.sunvote.homeworkproblem.impl;
  
 import java.util.List;
+
 import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
+
 import com.fh.dao.DaoSupport;
 import com.fh.entity.Page;
 import com.fh.util.PageData;
@@ -94,6 +97,12 @@ public class HomeworkProblemService implements HomeworkProblemManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("HomeworkProblemMapper.deleteAll", ArrayDATA_IDS);
 	}
+
+	@Override
+	public void deleteByCode(PageData pd) throws Exception {
+		dao.delete("HomeworkProblemMapper.deleteByCode", pd);
+		
+	}
  
 }