修改来函信息新增修改时显示无效专项任务，专项任务添加描述列，刷新返回按钮

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,

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);
 	}
 }

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">

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>