1来函信息专项任务显示审核人员及时间，审核通过及取消设置有效状态

2自定义列国际化

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -39,6 +39,7 @@
 		u.name AS editorName,
 		r.edit_time AS editTime,
 		e.name AS currentName,
+		e.name AS auditorName,
 		r.audit_time AS auditTime,
 		t.task_name AS taskName
 	from request_info r

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -43,7 +43,7 @@
 		r.create_time AS createTime,
 		u.name AS editorName,
 		r.edit_time AS editTime,
-		e.name AS currentName,
+		e.name AS auditorName,
 		r.audit_time AS auditTime
 	from task_info r
 	left join sys_user s on r.creator_id=s.id

src/main/java/com/nis/web/service/basics/TaskInfoService.java

@@ -63,6 +63,7 @@ public class TaskInfoService extends BaseService{
 		for (int i = 0; i < exId.length; i++) {
 			taskInfo.setId(Long.valueOf(exId[i]));
 			taskInfo.setIsAudit(1);//审核通过
+			taskInfo.setIsValid(1);//审核通过
 			taskInfo.setAuditTime(new Date());
 			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			taskInfoDao.update(taskInfo);
@@ -85,6 +86,7 @@ public class TaskInfoService extends BaseService{
 		for (int i = 0; i < cancelId.length; i++) {
 			taskInfo.setId(Long.valueOf(cancelId[i]));
 			taskInfo.setIsAudit(3);//取消审核通过
+			taskInfo.setIsValid(0);
 			taskInfo.setAuditTime(new Date());
 			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			taskInfoDao.update(taskInfo);

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -67,6 +67,7 @@ public class RequestInfoService extends BaseService{
 		for (int i = 0; i < exId.length; i++) {
 			requestInfo.setId(Long.valueOf(exId[i]));
 			requestInfo.setIsAudit(1);//审核通过
+			requestInfo.setIsValid(1);//审核通过有效
 			requestInfo.setAuditTime(new Date());
 			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			requestInfoDao.update(requestInfo);
@@ -89,6 +90,7 @@ public class RequestInfoService extends BaseService{
 		for (int i = 0; i < cancelId.length; i++) {
 			requestInfo.setId(Long.valueOf(cancelId[i]));
 			requestInfo.setIsAudit(3);//取消审核通过
+			requestInfo.setIsValid(0);//取消审核通过无效
 			requestInfo.setAuditTime(new Date());
 			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			requestInfoDao.update(requestInfo);

src/main/resources/messages/message_en.properties

@@ -172,6 +172,7 @@ has_approved=It has been approved and can not be operated on !
 hasnot_approved=It has not been approved and can not be operated on !
 check_one=choose one please !
 one_more=please choose at least one !
+custom_columns=custom columns
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/resources/messages/message_zh_CN.properties

@@ -171,6 +171,7 @@ has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\
 hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
 check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
 one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
+custom_columns=\u81ea\u5b9a\u4e49\u5217\u5b57\u6bb5
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp

@@ -82,6 +82,10 @@
 												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                         </a>
                                     </div>
 							
 								
@@ -158,6 +162,8 @@
 									<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="auditor"></spring:message></th>
+									<th><spring:message code="audit_time"></spring:message></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -187,6 +193,8 @@
 										</c:otherwise>
 									</c:choose>
 									</td>
+									<td>${taskInfo.auditorName }</td>
+									<td><fmt:formatDate value="${taskInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
 								</tr>
 							</c:forEach>
 					

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -90,7 +90,7 @@
                                         </div>
                         
                                         <a class="btn  btn-icon-only btn-default setfields tooltips" 
-                                      		  data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
                                          </a>
                                     </div>
@@ -180,7 +180,8 @@
 									<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="operation"></spring:message></th> --%>
+									<th><spring:message code="auditor"></spring:message></th>
+									<th><spring:message code="audit_time"></spring:message></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -213,6 +214,8 @@
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
+									<td>${requestInfo.auditorName }</td>
+									<td><fmt:formatDate value="${requestInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
 								</tr>
 							</c:forEach>