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 aa64cb5cb..c9e0cc0f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/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 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 3e373d774..e20b2db91 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/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 diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java index e4ebe5fb0..bf5cc2b99 100644 --- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java +++ b/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); 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 f74bc07c5..abeb0c464 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/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); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 28df3e32b..bcc6a4bd4 100644 --- a/src/main/resources/messages/message_en.properties +++ b/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===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 65c370e6f..da1c36715 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/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===================== diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index df9a34953..86c1e4d67 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -82,6 +82,10 @@