From ce7a950d6a47bc6b6bd3b3f4a0ec88081af5e2e5 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 20 Mar 2018 09:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9D=A5?=
 =?UTF-8?q?=E5=87=BD=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/RequestInfoDao.xml  |  3 ++-
 .../nis/web/dao/configuration/TaskInfoDao.xml |  9 ++++++-
 .../WEB-INF/views/basics/taskInfoList.jsp     | 25 ++++++++++---------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index c1ccddf73..890f20906 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -57,7 +57,8 @@
 				<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
 	</if>
 	<if test="requestNumber != null and requestNumber != ''">
-			AND r.request_number=#{requestNumber}
+			AND r.request_number like
+			<if test="dbName == 'mysql'">CONCAT('%',#{requestNumber},'%')</if>
 	</if>
 	<if test="isAudit != null">
 			AND r.is_audit=${isAudit}
diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
index 31cd25671..dfc22d571 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -64,7 +64,14 @@
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
 			AND r.edit_time between #{dobeginDate} and #{doendDate}
 	</if> 
-	order by r.create_time desc
+	<choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY r.create_time desc
+		</otherwise>
+	</choose>
   </select>
   <!-- 根据来函号查询 -->
   <select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index d4fd0b4b5..6bc675bac 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -36,7 +36,7 @@
 							
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
-							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 									
@@ -51,7 +51,7 @@
 									<div class="pull-left">	
 										<div class="input-group">
                                             <div class="input-group-btn">
-												<input id="taskName" name="taskName" class="form-control input-medium" placeholder=<spring:message code="input_title"/> type="text" value="${taskInfo.taskName }">
+												<input id="taskName" name="taskName" class="form-control input-medium" type="text" value="${taskInfo.taskName }">
                                             </div>
                                             
                                             <div class="input-group-btn">
@@ -163,11 +163,11 @@
 									<th><spring:message code="task_time"></spring:message></th>
 									<th><spring:message code="state"></spring:message></th>
 									<th><spring:message code="creator"></spring:message></th>
-									<th><spring:message code="create_time"></spring:message></th>
-									<th><spring:message code="editor"></spring:message></th>
-									<th><spring:message code="edit_time"></spring:message></th>
+									<th class="sort-column createTime"><spring:message code="create_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column editTime"><spring:message code="edit_time"/></th>
 									<th><spring:message code="auditor"></spring:message></th>
-									<th><spring:message code="audit_time"></spring:message></th>
+									<th class="sort-column auditTime"><spring:message code="audit_time"></spring:message></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -233,12 +233,13 @@
  	
  	
  	function resetx(){
-//  		$("#searchForm").reset();
- 		$(':input','#searchForm')
- 		.not(':button,:submit,:reset,:hidden')
- 		.val('')
- 		.removeAttr('checked')
- 		.removeAttr('selected');
+ 		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$("#searchForm")[0].reset();
  	}