孙向锦 / SunvoteEducation

Commit cf56576f8a50e5bbde2b674a28800426d6c87f47

Authored by jack
2 parents 0f2e7abc e2307de8

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

Inline Side-by-side
Showing 5 changed files with 64 additions and 28 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @cf56576
@@ -35,9 +35,9 @@ @@ -35,9 +35,9 @@
35 </div> 35 </div>
36 <div class="head_box_r"> 36 <div class="head_box_r">
37 <select name="status" id="status" style="width:90px;height:26px;margin-right:5px;padding:0;border-color:#aaa;"> 37 <select name="status" id="status" style="width:90px;height:26px;margin-right:5px;padding:0;border-color:#aaa;">
38 - <option value="0">全部</option>  
39 - <option value="1">完成</option>  
40 - <option value="2">未完成</option> 38 + <option value="">全部</option>
  39 + <option value="0" <c:if test="${pd.STATUS=='0'}">selected="true"</c:if>>未完成</option>
  40 + <option value="1" <c:if test="${pd.STATUS=='1'}">selected="true"</c:if>>完成</option>
41 </select> 41 </select>
42 <input class="date-picker" type="text" placeholder="开始日期" name="StartDate" id="StartDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.STARTDATE }"/> 42 <input class="date-picker" type="text" placeholder="开始日期" name="StartDate" id="StartDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.STARTDATE }"/>
43 <input type="text" class="date-picker" placeholder="结束日期" name="EndDate" name="EndDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.ENDDATE}"/> 43 <input type="text" class="date-picker" placeholder="结束日期" name="EndDate" name="EndDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.ENDDATE}"/>
@@ -188,28 +188,34 @@ @@ -188,28 +188,34 @@
188 function del(Id){ 188 function del(Id){
189 window.top.remove.init({"title":"删除","func":function(success){ 189 window.top.remove.init({"title":"删除","func":function(success){
190 if(success){ 190 if(success){
191 - var str = '';  
192 - for(var i=0;i < document.getElementsByName('ids').length;i++){  
193 - if(document.getElementsByName('ids')[i].checked){  
194 - if(str=='') str += document.getElementsByName('ids')[i].value;  
195 - else str += ',' + document.getElementsByName('ids')[i].value;  
196 - } 191 + var str = Id;
  192 + if(typeof(Id) == "undefined"){
  193 + str = '';
197 } 194 }
198 - if(str==''){  
199 -  
200 - }else{  
201 - $.ajax({  
202 - type: "POST",  
203 - url: '<%=basePath%>homework/deleteAll.do?tm='+new Date().getTime(),  
204 - data: {DATA_IDS:str},  
205 - dataType:'json',  
206 - //beforeSend: validateData,  
207 - cache: false,  
208 - success: function(data){  
209 - tosearch();  
210 - }  
211 - }); 195 + if(str == ''){
  196 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  197 + if(document.getElementsByName('ids')[i].checked){
  198 + if(str=='') str += document.getElementsByName('ids')[i].value;
  199 + else str += ',' + document.getElementsByName('ids')[i].value;
  200 + }
  201 + }
  202 + }
  203 + if(str == ''){
  204 + return ;
212 } 205 }
  206 +
  207 + $.ajax({
  208 + type: "POST",
  209 + url: '<%=basePath%>homework/deleteAll.do?tm='+new Date().getTime(),
  210 + data: {DATA_IDS:str},
  211 + dataType:'json',
  212 + //beforeSend: validateData,
  213 + cache: false,
  214 + success: function(data){
  215 + tosearch();
  216 + }
  217 + });
  218 +
213 } 219 }
214 else{ 220 else{
215 console.log("false"); 221 console.log("false");
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @cf56576
@@ -168,6 +168,16 @@ @@ -168,6 +168,16 @@
168 CODE = #{CODE} 168 CODE = #{CODE}
169 </select> 169 </select>
170 170
  171 +
  172 + <select id="querySubjectId" parameterType="pd" resultType="pd">
  173 + select
  174 + SUBJECT_ID
  175 + from
  176 + sv_coursemanagement
  177 + where TEACHER_ID = #{TEACHER_ID}
  178 + GROUP BY SUBJECT_ID
  179 + </select>
  180 +
171 <!-- 列表 --> 181 <!-- 列表 -->
172 <select id="datalistPage" parameterType="page" resultType="pd"> 182 <select id="datalistPage" parameterType="page" resultType="pd">
173 select 183 select
@@ -199,8 +209,12 @@ @@ -199,8 +209,12 @@
199 <if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 --> 209 <if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 -->
200 and COMPLETE_DATE &lt; #{pd.ENDDATE} 210 and COMPLETE_DATE &lt; #{pd.ENDDATE}
201 </if> 211 </if>
  212 + <if test="pd.STATUS != null and pd.STATUS != ''"><!-- 关键词检索 -->
  213 + and COMPLETE_COUNT = #{pd.STATUS}
  214 + </if>
202 215
203 and IS_DELETE is null 216 and IS_DELETE is null
  217 + ORDER BY COMPLETE_DATE DESC
204 </select> 218 </select>
205 219
206 <!-- 列表(全部) --> 220 <!-- 列表(全部) -->
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @cf56576
@@ -167,6 +167,9 @@ public class HomeworkController extends BaseController { @@ -167,6 +167,9 @@ public class HomeworkController extends BaseController {
167 ModelAndView mv = this.getModelAndView(); 167 ModelAndView mv = this.getModelAndView();
168 PageData pd = new PageData(); 168 PageData pd = new PageData();
169 pd = this.getPageData(); 169 pd = this.getPageData();
  170 + // 添加科目ID
  171 + pd.put("TEACHER_ID", getTeacherID());
  172 + pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
170 mv.setViewName("sunvote/homework/homework_edit2"); 173 mv.setViewName("sunvote/homework/homework_edit2");
171 mv.addObject("msg", "save"); 174 mv.addObject("msg", "save");
172 mv.addObject("operation", "add"); 175 mv.addObject("operation", "add");
@@ -174,7 +177,7 @@ public class HomeworkController extends BaseController { @@ -174,7 +177,7 @@ public class HomeworkController extends BaseController {
174 return mv; 177 return mv;
175 } 178 }
176 179
177 - /** 180 + /**
178 * 去修改页面 181 * 去修改页面
179 * 182 *
180 * @param 183 * @param
@@ -537,9 +540,6 @@ public class HomeworkController extends BaseController { @@ -537,9 +540,6 @@ public class HomeworkController extends BaseController {
537 @ResponseBody 540 @ResponseBody
538 public Object deleteAll() throws Exception { 541 public Object deleteAll() throws Exception {
539 logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework"); 542 logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
540 - if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {  
541 - return null;  
542 - } // 校验权限  
543 PageData pd = new PageData(); 543 PageData pd = new PageData();
544 Map<String, Object> map = new HashMap<String, Object>(); 544 Map<String, Object> map = new HashMap<String, Object>();
545 pd = this.getPageData(); 545 pd = this.getPageData();
@@ -691,6 +691,12 @@ public class HomeworkController extends BaseController { @@ -691,6 +691,12 @@ public class HomeworkController extends BaseController {
691 if (homework != null) { 691 if (homework != null) {
692 hpd.put("CODE", get32UUID()); 692 hpd.put("CODE", get32UUID());
693 hpd.put("NAME", homework.getNAME()); 693 hpd.put("NAME", homework.getNAME());
  694 + if(homework.getSUBJECT_ID() == null){
  695 + List<PageData> slist = homeworkService.querySubjectId(pd);
  696 + if(slist.size() > 0){
  697 + homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
  698 + }
  699 + }
694 hpd.put("SUBJECT_ID", homework.getSUBJECT_ID()); 700 hpd.put("SUBJECT_ID", homework.getSUBJECT_ID());
695 hpd.put("ALL_SCORE", homework.getALL_SCORE()); 701 hpd.put("ALL_SCORE", homework.getALL_SCORE());
696 hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC()); 702 hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC());
src/com/fh/service/sunvote/homework/HomeworkManager.java
  View file @cf56576
@@ -55,6 +55,11 @@ public interface HomeworkManager{ @@ -55,6 +55,11 @@ public interface HomeworkManager{
55 * @param pd 55 * @param pd
56 * @throws Exception 56 * @throws Exception
57 */ 57 */
  58 + public List<PageData> querySubjectId(PageData pd)throws Exception;
  59 + /**列表(全部)
  60 + * @param pd
  61 + * @throws Exception
  62 + */
58 public List<PageData> report(PageData pd)throws Exception; 63 public List<PageData> report(PageData pd)throws Exception;
59 /**列表(全部) 64 /**列表(全部)
60 * @param pd 65 * @param pd
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
  View file @cf56576
@@ -60,7 +60,7 @@ public class HomeworkService implements HomeworkManager{ @@ -60,7 +60,7 @@ public class HomeworkService implements HomeworkManager{
60 * @throws Exception 60 * @throws Exception
61 */ 61 */
62 public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception{ 62 public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception{
63 - dao.update("HomeworkMapper.deleteHomework", ArrayDATA_IDS); 63 + dao.update("HomeworkMapper.deleteHomeworkAll", ArrayDATA_IDS);
64 } 64 }
65 65
66 /**列表 66 /**列表
@@ -115,6 +115,11 @@ public class HomeworkService implements HomeworkManager{ @@ -115,6 +115,11 @@ public class HomeworkService implements HomeworkManager{
115 public List<PageData> report(PageData pd) throws Exception { 115 public List<PageData> report(PageData pd) throws Exception {
116 return (List<PageData>)dao.findForList("HomeworkMapper.report", pd); 116 return (List<PageData>)dao.findForList("HomeworkMapper.report", pd);
117 } 117 }
  118 +
  119 + @Override
  120 + public List<PageData> querySubjectId(PageData pd) throws Exception {
  121 + return (List<PageData>)dao.findForList("HomeworkMapper.querySubjectId", pd);
  122 + }
118 123
119 } 124 }
120 125