From d5d708a4924b300cc7ea0329d48938a6cd4f0d69 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 21 Mar 2018 11:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=A0=E6=95=88=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=88=97=EF=BC=8C=E5=88=B7=E6=96=B0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/dao/configuration/TaskInfoDao.xml     | 5 +++--
 .../nis/web/service/configuration/RequestInfoService.java  | 2 +-
 src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp      | 7 +++++++
 src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp      | 3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)

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 dfc22d571..e64cd5a6b 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -20,12 +20,12 @@
     id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time, 
     editor_id, edit_time, auditor_id, audit_time
   </sql>
-  
+  <!-- 查询有效且通过审核 -->
   <select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from task_info t
-    where is_valid!=-1 and is_audit !=3
+    where is_valid =1 and is_audit =1
     <if test="id!=null">
    		AND id = #{id,jdbcType=BIGINT}
     </if>
@@ -37,6 +37,7 @@
 		r.id AS id,
 		r.task_name AS taskName,
 		r.task_org AS taskOrg,
+		r.task_desc AS taskDesc,
 		r.task_time AS taskTime,
 		r.is_valid AS isValid,
 		r.is_audit AS isAudit,
diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
index 4f27509d6..47c997552 100644
--- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
+++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
@@ -114,6 +114,6 @@ public class RequestInfoService extends BaseService{
 	}
 
 	public List<TaskInfo> showTask(TaskInfo taskInfo) {
-		return taskInfoDao.findTaskInfo(taskInfo);
+		return taskInfoDao.findList(taskInfo);
 	}
 }
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
index 9cae2e494..0a014dcd4 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
@@ -9,6 +9,13 @@
 
 <div class="page-content">
 	<div class="row">
+	
+	<div class="theme-panel hidden-xs hidden-sm">
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
+	</div>
+	<h3 class="page-title">
+		<spring:message code="special_task"/>
+	</h3>
 		<div class="col-md-12">
 			<div class="portlet box blue">
 				<div class="portlet-title">
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index 6bc675bac..4b4efbf58 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -11,6 +11,7 @@
 <div class="page-content">
 	<shiro:hasPermission name="basics:taskInfo:edit">
 	<div class="theme-panel hidden-xs hidden-sm">
+	<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/taskInfo/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
 			<i class="fa fa-plus"></i>
@@ -162,6 +163,7 @@
 									<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="desc"></spring:message></th>
 									<th><spring:message code="creator"></spring:message></th>
 									<th class="sort-column createTime"><spring:message code="create_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -185,6 +187,7 @@
 											<c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+									<td>${taskInfo.taskDesc }</td>
 									<td>${taskInfo.creatorName }</td>
 									<td><fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/></td>
 									<td>${taskInfo.editorName }</td>