diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
index 7a945c4a8..d21b50a03 100644
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -95,7 +95,7 @@ public class RequestInfoController extends BaseController{
}
/**
- * 审核
+ * 审核通过
* @param requestInfo
* @param model
* @return
@@ -107,6 +107,19 @@ public class RequestInfoController extends BaseController{
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
+ /**
+ * 审核未通过
+ * @param requestInfo
+ * @param model
+ * @return
+ */
+ @RequestMapping(value = "requestExamineNo")
+ public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+ requestInfoService.requestExamineNo(requestInfo);
+ addMessage(redirectAttributes, "success");
+ return "redirect:" + adminPath + "/cfg/request/list?repage";
+
+ }
/**
* 取消审核
* @param requestInfo
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 01d98d236..fe2e0f119 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,11 @@ public class RequestInfoService extends BaseService{
requestInfoDao.update(requestInfo);
}
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+ public void requestExamineNo(RequestInfo requestInfo){
+ requestInfo.setIsAudit(2);//审核未通过
+ requestInfoDao.update(requestInfo);
+ }
+ @Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void requestCancelExamine(RequestInfo requestInfo){
requestInfo.setIsAudit(3);//取消审核通过
int update = requestInfoDao.update(requestInfo);
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index e113d11de..4d94a35a6 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -115,7 +115,7 @@ state=\u72b6\u6001
created=\u672a\u5ba1\u6838
examine=\u5ba1\u6838
unapproved=\u672a\u901a\u8fc7
-approved=\u5df2\u901a\u8fc7
+approved=\u901a\u8fc7
title=\u6807\u9898
request_time=\u6765\u51fd\u65f6\u95f4
operate_time=\u64cd\u4f5c\u65f6\u95f4
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 93310dae3..2b10bc8cd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -122,8 +122,14 @@
', this.href)">
+
+ ', this.href)">
+ ', this.href)">
+ ', this.href)">
+ ', this.href)">
+
- ', this.href)">
+ ', this.href)">
', this.href)">
', this.href)">