Commit f1a8eb10f4ea36eaaf9cff388d7c369dfed75db7
1 parent
bf0c69bb
作业功能更新
Showing
2 changed files
with
20 additions
and
9 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
| @@ -23,7 +23,8 @@ | @@ -23,7 +23,8 @@ | ||
| 23 | <link href="static/css/teach.css" rel="stylesheet"> | 23 | <link href="static/css/teach.css" rel="stylesheet"> |
| 24 | </head> | 24 | </head> |
| 25 | <body class="no-skin"> | 25 | <body class="no-skin"> |
| 26 | - <form action="../paper/list2.do" method="post" name="Form" id="Form"> | 26 | + <form action="homework/list.do" method="post" name="Form" id="Form"> |
| 27 | + <input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/> | ||
| 27 | <div class="head_box"> | 28 | <div class="head_box"> |
| 28 | <div class="box_header"> | 29 | <div class="box_header"> |
| 29 | <div class="head_box_l"> | 30 | <div class="head_box_l"> |
| @@ -37,9 +38,9 @@ | @@ -37,9 +38,9 @@ | ||
| 37 | <option value="1">完成</option> | 38 | <option value="1">完成</option> |
| 38 | <option value="2">未完成</option> | 39 | <option value="2">未完成</option> |
| 39 | </select> | 40 | </select> |
| 40 | - <input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> | ||
| 41 | - <input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/> | ||
| 42 | - <a href="#" onclick="tosearch();"><img | 41 | + <input class="date-picker" type="text" placeholder="开始日期" name="StartDate" id="StartDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.STARTDATE }"/> |
| 42 | + <input type="text" class="date-picker" placeholder="结束日期" name="EndDate" name="EndDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.ENDDATE}"/> | ||
| 43 | + <a onclick="tosearch();"><img | ||
| 43 | src="static/images/search.png" /></a> | 44 | src="static/images/search.png" /></a> |
| 44 | </div> | 45 | </div> |
| 45 | <div class="clear"></div> | 46 | <div class="clear"></div> |
| @@ -85,14 +86,14 @@ | @@ -85,14 +86,14 @@ | ||
| 85 | <c:forEach items="${varList}" var="var" varStatus="vs"> | 86 | <c:forEach items="${varList}" var="var" varStatus="vs"> |
| 86 | <tr> | 87 | <tr> |
| 87 | <td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td> | 88 | <td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td> |
| 88 | - <td ><a target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.HOMEWORK_ID}">${var.NAME}</a></td> | 89 | + <td ><a target="_blank" href="<%=basePath%>homework/iteminfo.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td> |
| 89 | <td >${var.CREATE_DATE}</td> | 90 | <td >${var.CREATE_DATE}</td> |
| 90 | <td >${var.COMPLETE_DATE}</td> | 91 | <td >${var.COMPLETE_DATE}</td> |
| 91 | <td >${var.QUESTIOM_COUNT}</td> | 92 | <td >${var.QUESTIOM_COUNT}</td> |
| 92 | <td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td> | 93 | <td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td> |
| 93 | <td >${var.ALL_SCORE}</td> | 94 | <td >${var.ALL_SCORE}</td> |
| 94 | <td> | 95 | <td> |
| 95 | - <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> | 96 | + <a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> |
| 96 | <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a> | 97 | <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a> |
| 97 | </td> | 98 | </td> |
| 98 | </tr> | 99 | </tr> |
| @@ -110,7 +111,7 @@ | @@ -110,7 +111,7 @@ | ||
| 110 | </table> | 111 | </table> |
| 111 | <div class="footer"> | 112 | <div class="footer"> |
| 112 | <div class="creat"> | 113 | <div class="creat"> |
| 113 | - <input type="button" onclick="edit()" value="布置练习" /> | 114 | + <input type="button" onclick="add()" value="布置练习" /> |
| 114 | </div> | 115 | </div> |
| 115 | <div class="removeAll"> | 116 | <div class="removeAll"> |
| 116 | <input type="button" onclick="deleteAll()" value="批量删除" /> | 117 | <input type="button" onclick="deleteAll()" value="批量删除" /> |
| @@ -145,6 +146,10 @@ | @@ -145,6 +146,10 @@ | ||
| 145 | todayHighlight: true | 146 | todayHighlight: true |
| 146 | }); | 147 | }); |
| 147 | }); | 148 | }); |
| 149 | + | ||
| 150 | + function tosearch(){ | ||
| 151 | + $("#Form").submit(); | ||
| 152 | + } | ||
| 148 | function edit(Id){ | 153 | function edit(Id){ |
| 149 | window.top.modal.init({ | 154 | window.top.modal.init({ |
| 150 | 'title':'布置练习', | 155 | 'title':'布置练习', |
resources/mybatis1/sunvote/HomeworkMapper.xml
| @@ -155,8 +155,14 @@ | @@ -155,8 +155,14 @@ | ||
| 155 | <if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 --> | 155 | <if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 --> |
| 156 | and TEACHER_ID = #{pd.TEACHER_ID} | 156 | and TEACHER_ID = #{pd.TEACHER_ID} |
| 157 | </if> | 157 | </if> |
| 158 | - <if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 --> | ||
| 159 | - and COMPLETE_DATE > #{pd.COMPLETE_DATE} | 158 | + <if test="pd.COMPLETE_DATE != null and pd.COMPLETE_DATE != ''"><!-- 关键词检索 --> |
| 159 | + and COMPLETE_DATE = #{pd.COMPLETE_DATE} | ||
| 160 | + </if> | ||
| 161 | + <if test="pd.STARTDATE != null and pd.STARTDATE != ''"><!-- 关键词检索 --> | ||
| 162 | + and COMPLETE_DATE > #{pd.STARTDATE} | ||
| 163 | + </if> | ||
| 164 | + <if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 --> | ||
| 165 | + and COMPLETE_DATE < #{pd.ENDDATE} | ||
| 160 | </if> | 166 | </if> |
| 161 | </select> | 167 | </select> |
| 162 | 168 |