Commit 2c6bc93d401c1b565d6ba7bd0cfedad47929b68a
1 parent
85ea5817
更新作业
Showing
8 changed files
with
147 additions
and
3 deletions
resources/mybatis1/sunvote/HomeworkMapper.xml
| @@ -133,6 +133,16 @@ | @@ -133,6 +133,16 @@ | ||
| 133 | HOMEWORK_ID = #{HOMEWORK_ID} | 133 | HOMEWORK_ID = #{HOMEWORK_ID} |
| 134 | </select> | 134 | </select> |
| 135 | 135 | ||
| 136 | + <!-- 通过ID获取数据 --> | ||
| 137 | + <select id="findByCode" parameterType="pd" resultType="pd"> | ||
| 138 | + select | ||
| 139 | + <include refid="Field"></include> | ||
| 140 | + from | ||
| 141 | + <include refid="tableName"></include> | ||
| 142 | + where | ||
| 143 | + CODE = #{CODE} | ||
| 144 | + </select> | ||
| 145 | + | ||
| 136 | <!-- 列表 --> | 146 | <!-- 列表 --> |
| 137 | <select id="datalistPage" parameterType="page" resultType="pd"> | 147 | <select id="datalistPage" parameterType="page" resultType="pd"> |
| 138 | select | 148 | select |
resources/mybatis1/sunvote/HomeworkProblemMapper.xml
| @@ -56,6 +56,14 @@ | @@ -56,6 +56,14 @@ | ||
| 56 | HOMEWORKPROBLEM_ID = #{HOMEWORKPROBLEM_ID} | 56 | HOMEWORKPROBLEM_ID = #{HOMEWORKPROBLEM_ID} |
| 57 | </delete> | 57 | </delete> |
| 58 | 58 | ||
| 59 | + <!-- 删除--> | ||
| 60 | + <delete id="deleteByCode" parameterType="pd"> | ||
| 61 | + delete from | ||
| 62 | + <include refid="tableName"></include> | ||
| 63 | + where | ||
| 64 | + HOMEWORK_ID = #{CODE} | ||
| 65 | + </delete> | ||
| 66 | + | ||
| 59 | <!-- 修改 --> | 67 | <!-- 修改 --> |
| 60 | <update id="edit" parameterType="pd"> | 68 | <update id="edit" parameterType="pd"> |
| 61 | update | 69 | update |
src/com/fh/bean/Homework.java
| @@ -6,6 +6,7 @@ import com.google.gson.Gson; | @@ -6,6 +6,7 @@ import com.google.gson.Gson; | ||
| 6 | 6 | ||
| 7 | public class Homework { | 7 | public class Homework { |
| 8 | 8 | ||
| 9 | + private String HOMEWORK_ID; | ||
| 9 | private String CODE; | 10 | private String CODE; |
| 10 | private String NAME; | 11 | private String NAME; |
| 11 | private String SUBJECT_ID; | 12 | private String SUBJECT_ID; |
| @@ -72,7 +73,7 @@ public class Homework { | @@ -72,7 +73,7 @@ public class Homework { | ||
| 72 | return QUESTION_COUNT; | 73 | return QUESTION_COUNT; |
| 73 | } | 74 | } |
| 74 | 75 | ||
| 75 | - public void setQUESTIOMS(List<HomeworkQuestion> QUESTIOMS) { | 76 | + public void setQUESTIONS(List<HomeworkQuestion> QUESTIOMS) { |
| 76 | this.QUESTIONS = QUESTIOMS; | 77 | this.QUESTIONS = QUESTIOMS; |
| 77 | } | 78 | } |
| 78 | 79 | ||
| @@ -93,6 +94,16 @@ public class Homework { | @@ -93,6 +94,16 @@ public class Homework { | ||
| 93 | public void setQUESTION_COUNT(String qUESTION_COUNT) { | 94 | public void setQUESTION_COUNT(String qUESTION_COUNT) { |
| 94 | QUESTION_COUNT = qUESTION_COUNT; | 95 | QUESTION_COUNT = qUESTION_COUNT; |
| 95 | } | 96 | } |
| 97 | + | ||
| 98 | + | ||
| 99 | + | ||
| 100 | + public String getHOMEWORK_ID() { | ||
| 101 | + return HOMEWORK_ID; | ||
| 102 | + } | ||
| 103 | + | ||
| 104 | + public void setHOMEWORK_ID(String hOMEWORK_ID) { | ||
| 105 | + HOMEWORK_ID = hOMEWORK_ID; | ||
| 106 | + } | ||
| 96 | 107 | ||
| 97 | public static Homework parse(String json) { | 108 | public static Homework parse(String json) { |
| 98 | Gson gson = new Gson(); | 109 | Gson gson = new Gson(); |
src/com/fh/controller/sunvote/homework/HomeworkController.java
| @@ -113,7 +113,7 @@ public class HomeworkController extends BaseController { | @@ -113,7 +113,7 @@ public class HomeworkController extends BaseController { | ||
| 113 | logBefore(logger, Jurisdiction.getUsername() + "列表Homework"); | 113 | logBefore(logger, Jurisdiction.getUsername() + "列表Homework"); |
| 114 | ModelAndView mv = this.getModelAndView(); | 114 | ModelAndView mv = this.getModelAndView(); |
| 115 | PageData pd = new PageData(); | 115 | PageData pd = new PageData(); |
| 116 | - pd = this.getPageData(); | 116 | + pd = this.getPageData(); |
| 117 | String keywords = pd.getString("keywords"); // 关键词检索条件 | 117 | String keywords = pd.getString("keywords"); // 关键词检索条件 |
| 118 | if (null != keywords && !"".equals(keywords)) { | 118 | if (null != keywords && !"".equals(keywords)) { |
| 119 | pd.put("keywords", keywords.trim()); | 119 | pd.put("keywords", keywords.trim()); |
| @@ -143,7 +143,7 @@ public class HomeworkController extends BaseController { | @@ -143,7 +143,7 @@ public class HomeworkController extends BaseController { | ||
| 143 | mv.addObject("pd", pd); | 143 | mv.addObject("pd", pd); |
| 144 | return mv; | 144 | return mv; |
| 145 | } | 145 | } |
| 146 | - | 146 | + |
| 147 | /** | 147 | /** |
| 148 | * 去新增页面 | 148 | * 去新增页面 |
| 149 | * | 149 | * |
| @@ -398,4 +398,91 @@ public class HomeworkController extends BaseController { | @@ -398,4 +398,91 @@ public class HomeworkController extends BaseController { | ||
| 398 | } | 398 | } |
| 399 | return responseGson.toJson(); | 399 | return responseGson.toJson(); |
| 400 | } | 400 | } |
| 401 | + | ||
| 402 | + @RequestMapping(value = "/updateHomework", produces = "application/json;charset=UTF-8") | ||
| 403 | + @ResponseBody | ||
| 404 | + public String updateHomework() throws Exception { | ||
| 405 | + PageData pd = new PageData(); | ||
| 406 | + pd = this.getPageData(); | ||
| 407 | + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); | ||
| 408 | + String data = pd.getJsonString(); | ||
| 409 | + ResponseGson<String> responseGson = new ResponseGson<String>(); | ||
| 410 | + | ||
| 411 | + Homework homework = Homework.parse(data); | ||
| 412 | + | ||
| 413 | + PageData hpd = new PageData(); | ||
| 414 | + if (homework != null) { | ||
| 415 | + if (homework.getHOMEWORK_ID() != null | ||
| 416 | + && !"".equals(homework.getHOMEWORK_ID().trim())) { | ||
| 417 | + hpd.put("HOMEWORK_ID", homework.getHOMEWORK_ID()); | ||
| 418 | + hpd = homeworkService.findById(hpd); | ||
| 419 | + if(hpd != null){ | ||
| 420 | + hpd.put("NAME", homework.getNAME()); | ||
| 421 | + hpd.put("SUBJECT_ID", homework.getSUBJECT_ID()); | ||
| 422 | + hpd.put("ALL_SCORE", homework.getALL_SCORE()); | ||
| 423 | + hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC()); | ||
| 424 | + hpd.put("QUESTION_COUNT", homework.getQUESTION_COUNT()); | ||
| 425 | + hpd.put("CREATE_DATE", format.format(new Date())); | ||
| 426 | + hpd.put("MODIFY_DATE", format.format(new Date())); | ||
| 427 | + hpd.put("COMPLETE_COUNT", 0); | ||
| 428 | + hpd.put("TEACHER_ID", homework.getTEACHER_ID()); | ||
| 429 | + hpd.put("COMPLETE_DESC", ""); | ||
| 430 | + if(homeworkService.findByCode(hpd).size() > 1){ | ||
| 431 | + hpd.put("CODE", get32UUID()); | ||
| 432 | + for (HomeClass homeclass : homework.getCLASSLIST()) { | ||
| 433 | + hpd.put("CLASS_ID", homeclass.getCLASS_ID()); | ||
| 434 | + hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE()); | ||
| 435 | + homeworkService.edit(hpd); | ||
| 436 | + } | ||
| 437 | + for (HomeworkQuestion homeworkQuestion : homework | ||
| 438 | + .getQUESTIONS()) { | ||
| 439 | + PageData qpd = new PageData(); | ||
| 440 | + qpd.put("RANK", homeworkQuestion.getRANK()); | ||
| 441 | + qpd.put("CODE", hpd.get("CODE")); | ||
| 442 | + qpd.put("NAME", homeworkQuestion.getNAME()); | ||
| 443 | + qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM()); | ||
| 444 | + qpd.put("SCORE", homeworkQuestion.getSCORE()); | ||
| 445 | + qpd.put("RIGHT_ANSWER", | ||
| 446 | + homeworkQuestion.getRIGHT_ANSWER()); | ||
| 447 | + qpd.put("TYPE", homeworkQuestion.getTYPE()); | ||
| 448 | + qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID()); | ||
| 449 | + qpd.put("HOMEWORK_ID", hpd.get("CODE")); | ||
| 450 | + homeworkproblemService.save(qpd); | ||
| 451 | + } | ||
| 452 | + responseGson.setData(hpd.getString("CODE")); | ||
| 453 | + }else{ | ||
| 454 | + for (HomeClass homeclass : homework.getCLASSLIST()) { | ||
| 455 | + hpd.put("CLASS_ID", homeclass.getCLASS_ID()); | ||
| 456 | + hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE()); | ||
| 457 | + homeworkService.edit(hpd); | ||
| 458 | + } | ||
| 459 | + homeworkproblemService.deleteByCode(hpd); | ||
| 460 | + for (HomeworkQuestion homeworkQuestion : homework | ||
| 461 | + .getQUESTIONS()) { | ||
| 462 | + PageData qpd = new PageData(); | ||
| 463 | + qpd.put("RANK", homeworkQuestion.getRANK()); | ||
| 464 | + qpd.put("CODE", hpd.get("CODE")); | ||
| 465 | + qpd.put("NAME", homeworkQuestion.getNAME()); | ||
| 466 | + qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM()); | ||
| 467 | + qpd.put("SCORE", homeworkQuestion.getSCORE()); | ||
| 468 | + qpd.put("RIGHT_ANSWER", | ||
| 469 | + homeworkQuestion.getRIGHT_ANSWER()); | ||
| 470 | + qpd.put("TYPE", homeworkQuestion.getTYPE()); | ||
| 471 | + qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID()); | ||
| 472 | + qpd.put("HOMEWORK_ID", hpd.get("CODE")); | ||
| 473 | + homeworkproblemService.save(qpd); | ||
| 474 | + } | ||
| 475 | + responseGson.setData(hpd.getString("CODE")); | ||
| 476 | + } | ||
| 477 | + }else{ | ||
| 478 | + responseGson.setDataError(); | ||
| 479 | + } | ||
| 480 | + } else { | ||
| 481 | + responseGson.setDataError(); | ||
| 482 | + } | ||
| 483 | + } else { | ||
| 484 | + responseGson.setDataError(); | ||
| 485 | + } | ||
| 486 | + return responseGson.toJson(); | ||
| 487 | + } | ||
| 401 | } | 488 | } |
src/com/fh/service/sunvote/homework/HomeworkManager.java
| @@ -53,6 +53,12 @@ public interface HomeworkManager{ | @@ -53,6 +53,12 @@ public interface HomeworkManager{ | ||
| 53 | */ | 53 | */ |
| 54 | public PageData findById(PageData pd)throws Exception; | 54 | public PageData findById(PageData pd)throws Exception; |
| 55 | 55 | ||
| 56 | + /**通过code获取数据 | ||
| 57 | + * @param pd | ||
| 58 | + * @throws Exception | ||
| 59 | + */ | ||
| 60 | + public List<PageData> findByCode(PageData pd)throws Exception; | ||
| 61 | + | ||
| 56 | /**批量删除 | 62 | /**批量删除 |
| 57 | * @param ArrayDATA_IDS | 63 | * @param ArrayDATA_IDS |
| 58 | * @throws Exception | 64 | * @throws Exception |
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
| 1 | package com.fh.service.sunvote.homework.impl; | 1 | package com.fh.service.sunvote.homework.impl; |
| 2 | 2 | ||
| 3 | import java.util.List; | 3 | import java.util.List; |
| 4 | + | ||
| 4 | import javax.annotation.Resource; | 5 | import javax.annotation.Resource; |
| 6 | + | ||
| 5 | import org.springframework.stereotype.Service; | 7 | import org.springframework.stereotype.Service; |
| 8 | + | ||
| 6 | import com.fh.dao.DaoSupport; | 9 | import com.fh.dao.DaoSupport; |
| 7 | import com.fh.entity.Page; | 10 | import com.fh.entity.Page; |
| 8 | import com.fh.util.PageData; | 11 | import com.fh.util.PageData; |
| @@ -86,6 +89,11 @@ public class HomeworkService implements HomeworkManager{ | @@ -86,6 +89,11 @@ public class HomeworkService implements HomeworkManager{ | ||
| 86 | public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ | 89 | public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ |
| 87 | dao.delete("HomeworkMapper.deleteAll", ArrayDATA_IDS); | 90 | dao.delete("HomeworkMapper.deleteAll", ArrayDATA_IDS); |
| 88 | } | 91 | } |
| 92 | + | ||
| 93 | + @Override | ||
| 94 | + public List<PageData> findByCode(PageData pd) throws Exception { | ||
| 95 | + return (List<PageData>)dao.findForList("HomeworkMapper.findByCode", pd); | ||
| 96 | + } | ||
| 89 | 97 | ||
| 90 | } | 98 | } |
| 91 | 99 |
src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
| @@ -23,6 +23,11 @@ public interface HomeworkProblemManager{ | @@ -23,6 +23,11 @@ public interface HomeworkProblemManager{ | ||
| 23 | * @throws Exception | 23 | * @throws Exception |
| 24 | */ | 24 | */ |
| 25 | public void delete(PageData pd)throws Exception; | 25 | public void delete(PageData pd)throws Exception; |
| 26 | + /**删除 | ||
| 27 | + * @param pd | ||
| 28 | + * @throws Exception | ||
| 29 | + */ | ||
| 30 | + public void deleteByCode(PageData pd)throws Exception; | ||
| 26 | 31 | ||
| 27 | /**修改 | 32 | /**修改 |
| 28 | * @param pd | 33 | * @param pd |
src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
| 1 | package com.fh.service.sunvote.homeworkproblem.impl; | 1 | package com.fh.service.sunvote.homeworkproblem.impl; |
| 2 | 2 | ||
| 3 | import java.util.List; | 3 | import java.util.List; |
| 4 | + | ||
| 4 | import javax.annotation.Resource; | 5 | import javax.annotation.Resource; |
| 6 | + | ||
| 5 | import org.springframework.stereotype.Service; | 7 | import org.springframework.stereotype.Service; |
| 8 | + | ||
| 6 | import com.fh.dao.DaoSupport; | 9 | import com.fh.dao.DaoSupport; |
| 7 | import com.fh.entity.Page; | 10 | import com.fh.entity.Page; |
| 8 | import com.fh.util.PageData; | 11 | import com.fh.util.PageData; |
| @@ -94,6 +97,12 @@ public class HomeworkProblemService implements HomeworkProblemManager{ | @@ -94,6 +97,12 @@ public class HomeworkProblemService implements HomeworkProblemManager{ | ||
| 94 | public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ | 97 | public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ |
| 95 | dao.delete("HomeworkProblemMapper.deleteAll", ArrayDATA_IDS); | 98 | dao.delete("HomeworkProblemMapper.deleteAll", ArrayDATA_IDS); |
| 96 | } | 99 | } |
| 100 | + | ||
| 101 | + @Override | ||
| 102 | + public void deleteByCode(PageData pd) throws Exception { | ||
| 103 | + dao.delete("HomeworkProblemMapper.deleteByCode", pd); | ||
| 104 | + | ||
| 105 | + } | ||
| 97 | 106 | ||
| 98 | } | 107 | } |
| 99 | 108 |