gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

来函信息操作增加未通过

Browse Source
This commit is contained in:
zhanghongqing
2018-03-07 14:30:56 +08:00
parent 64532a60a5
commit 16f86ace64
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -95,7 +95,7 @@ public class RequestInfoController extends BaseController{
} }
/** /**
* 审核 * 审核通过
* @param requestInfo * @param requestInfo
* @param model * @param model
* @return * @return
@@ -107,6 +107,19 @@ public class RequestInfoController extends BaseController{
return "redirect:" + adminPath + "/cfg/request/list?repage"; 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 * @param requestInfo

5
src/main/java/com/nis/web/service/configuration/RequestInfoService.java
View File

@@ -67,6 +67,11 @@ public class RequestInfoService extends BaseService{
requestInfoDao.update(requestInfo); requestInfoDao.update(requestInfo);
} }
@Transactional(readOnly=false,rollbackFor=DataAccessException.class) @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){ public void requestCancelExamine(RequestInfo requestInfo){
requestInfo.setIsAudit(3);//取消审核通过 requestInfo.setIsAudit(3);//取消审核通过
int update = requestInfoDao.update(requestInfo); int update = requestInfoDao.update(requestInfo);

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -115,7 +115,7 @@ state=\u72b6\u6001
created=\u672a\u5ba1\u6838 created=\u672a\u5ba1\u6838
examine=\u5ba1\u6838 examine=\u5ba1\u6838
unapproved=\u672a\u901a\u8fc7 unapproved=\u672a\u901a\u8fc7
approved=\u5df2\u901a\u8fc7 approved=\u901a\u8fc7
title=\u6807\u9898 title=\u6807\u9898
request_time=\u6765\u51fd\u65f6\u95f4 request_time=\u6765\u51fd\u65f6\u95f4
operate_time=\u64cd\u4f5c\u65f6\u95f4 operate_time=\u64cd\u4f5c\u65f6\u95f4

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

@@ -122,8 +122,14 @@
<c:when test="${requestInfo.isAudit eq '1'}"> <c:when test="${requestInfo.isAudit eq '1'}">
<li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li> <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
</c:when> </c:when>
<c:when test="${requestInfo.isAudit ne '2'}">
<li><a href="${ctx}/cfg/request/requestExamineNo?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="unapproved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:otherwise> <c:otherwise>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></spring:message></a></li> <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li> <li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li> <li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:otherwise> </c:otherwise>