From 93d7f3a9170268659333fd5324d239aeecfdc9fe Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 16 Mar 2018 18:29:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/RequestInfoDao.xml  |  4 +-
 .../nis/web/dao/configuration/TaskInfoDao.xml |  2 +-
 .../messages/message_zh_CN.properties         |  2 +-
 .../WEB-INF/views/basics/taskInfoList.jsp     | 22 ++++------
 .../webapp/WEB-INF/views/cfg/requestForm.jsp  | 10 -----
 .../webapp/WEB-INF/views/cfg/requestList.jsp  | 43 ++++++++++---------
 6 files changed, 35 insertions(+), 48 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 3baa562e4..71979abec 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -66,8 +66,8 @@
 			AND r.request_time between #{beginDate} and #{endDate}
  	</if>
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
-	</if> 
+			AND r.edit_time between #{dobeginDate} and #{doendDate}
+	</if>
 	order by r.request_time desc
   </select>
   <!-- 根据来函号查询 -->
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 d3e936cd4..683e8561a 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -62,7 +62,7 @@
 			AND r.task_time between #{beginDate} and #{endDate}
  	</if>
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
+			AND r.edit_time between #{dobeginDate} and #{doendDate}
 	</if> 
 	order by r.task_time desc
   </select>
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index da1c36715..1eca25fed 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -106,7 +106,7 @@ desc=\u63cf\u8ff0\u4fe1\u606f
 parent_id=\u7236ID
 is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
 is_valid=\u6709\u6548\u6807\u5fd7
-create_time=\u914d\u7f6e\u65f6\u95f4
+create_time=\u521b\u5efa\u65f6\u95f4
 edit_time=\u4fee\u6539\u65f6\u95f4
 superior_config=\u4e0a\u7ea7\u914d\u7f6e
 config_content=\u914d\u7f6e\u5185\u5bb9
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index 86c1e4d67..ccd49bb4d 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -116,7 +116,7 @@
 							
 									<div class="col-md-6">
 										<div class="pull-left">
-											<label><spring:message code="operate_time"/>：</label>
+											<label><spring:message code="edit_time"/>：</label>
 										</div>
 										<div class="pull-left">
 											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -160,8 +160,10 @@
 									<th><spring:message code="task_org"></spring:message></th>
 									<th><spring:message code="task_time"></spring:message></th>
 									<th><spring:message code="state"></spring:message></th>
-									<th><spring:message code="operator"></spring:message></th>
-									<th><spring:message code="operate_time"></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><spring:message code="auditor"></spring:message></th>
 									<th><spring:message code="audit_time"></spring:message></th>
 								</tr>
@@ -182,17 +184,9 @@
 										</c:choose>
 									</td>
 									<td>${taskInfo.creatorName }</td>
-									<td>
-									<!-- 编辑时间为空则显示创建时间 -->
-									<c:choose>
-										<c:when test="${empty taskInfo.editTime}">
-											<fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/>
-										</c:otherwise>
-									</c:choose>
-									</td>
+									<td><fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/></td>
+									<td>${taskInfo.editorName }</td>
+									<td><fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/></td>
 									<td>${taskInfo.auditorName }</td>
 									<td><fmt:formatDate value="${taskInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
 								</tr>
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
index e256c9d34..aebed9bba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -81,16 +81,6 @@
 		</div>
 	</div>
 </div>
-<style>
-	.input-medium {
-    width: 200px !important;
-}
-	.Wdate {
-	border: #c2cad8 1px solid;
-    height: 34px;
-}
-	
-</style>
 <script type="text/javascript">
 		 $(document).ready(function() {
 	 		
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index cb2ac99f5..fbbff7db9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -126,7 +126,7 @@
 							
 									<div class="col-md-6">
 										<div class="pull-left">
-											<label><spring:message code="operate_time"/>：</label>
+											<label><spring:message code="edit_time"/>：</label>
 										</div>
 										<div class="pull-left">
 											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -175,11 +175,13 @@
 									<th><spring:message code="request_organization"></spring:message></th>
 									<th><spring:message code="request_time"></spring:message></th>
 									<th><spring:message code="state"></spring:message></th>
-									<th><spring:message code="operator"></spring:message></th>
-									<th><spring:message code="operate_time"></spring:message></th>
 									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
 									<th><spring:message code="special_task"></spring:message></th>
+									<th><spring:message code="creator"/></th>
+									<th><spring:message code="create_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th><spring:message code="edit_time"/></th>
 									<th><spring:message code="auditor"></spring:message></th>
 									<th><spring:message code="audit_time"></spring:message></th>
 								</tr>
@@ -199,21 +201,13 @@
 											<c:when test="${requestInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td>${requestInfo.creatorName }</td>
-									<td>
-									<!-- 编辑时间为空则显示创建时间 -->
-									<c:choose>
-										<c:when test="${empty requestInfo.editTime}">
-											<fmt:formatDate value="${requestInfo.createTime }" pattern="yyyy-MM-dd"/>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${requestInfo.editTime }" pattern="yyyy-MM-dd"/>
-										</c:otherwise>
-									</c:choose>
-									</td>
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
+									<td>${requestInfo.creatorName }</td>
+									<td><fmt:formatDate value="${requestInfo.createTime }" pattern="yyyy-MM-dd"/></td>
+									<td>${requestInfo.editorName }</td>
+									<td><fmt:formatDate value="${requestInfo.editTime }" pattern="yyyy-MM-dd"/></td>
 									<td>${requestInfo.auditorName }</td>
 									<td><fmt:formatDate value="${requestInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
 								</tr>
@@ -268,11 +262,20 @@
  	
  	function resetx(){
 //  		$("#searchForm").reset();
- 		$(':input','#searchForm')
- 		.not(':button,:submit,:reset,:hidden')
- 		.val('')
- 		.removeAttr('checked')
- 		.removeAttr('selected');
+//  		$(':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();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='title'/>");
+ 		
  	}