From 6ae81cf82025cc250fdb7f09869e690fc125a97d Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 16:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8-IP?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80action=E8=BF=87=E6=BB=A4asn=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E6=9C=89=E7=9A=84=20entrance=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/report/NtcDestIpReportController.java    | 2 +-
 .../web/controller/report/NtcEntranceReportController.java  | 2 +-
 .../nis/web/controller/report/NtcLwhhReportController.java  | 4 ++--
 .../controller/report/NtcSrcipDomesticReportController.java | 2 +-
 .../nis/web/controller/report/NtcTagReportController.java   | 2 +-
 .../nis/web/controller/report/NtcXzReportController.java    | 2 +-
 .../resources/sql/20181203/add_sys_data_dictionary_name.sql | 1 -
 src/main/webapp/WEB-INF/views/report/list.jsp               | 6 +++---
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
index b8d762aa1..eadd99357 100644
--- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
@@ -36,7 +36,7 @@ public class NtcDestIpReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
index c0edf6ce4..c197a2e2a 100644
--- a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
@@ -35,7 +35,7 @@ public class NtcEntranceReportController extends BaseController {
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
index 09b9d092a..6e834403f 100644
--- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
@@ -34,10 +34,10 @@ public class NtcLwhhReportController extends BaseController {
 	@RequestMapping("/ajaxNtcLwhhReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
+		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
index e5f609cfc..433f917e6 100644
--- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
@@ -35,7 +35,7 @@ public class NtcSrcipDomesticReportController extends BaseController {
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
index 08ad4aca9..6af37d2a9 100644
--- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
@@ -37,7 +37,7 @@ public class NtcTagReportController extends BaseController {
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
index c6106dbfb..5fc865c0f 100644
--- a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
@@ -38,7 +38,7 @@ public class NtcXzReportController extends BaseController {
 		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
 		model.addAttribute("xzs", xzs);
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
index 541194dde..c97a8c2bb 100644
--- a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
+++ b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
@@ -3,6 +3,5 @@ INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `
 
 
 #日志查询-出入口字典添加
-INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('81', '出入口', 'ENTRANCE', '出入口id和对应的名称', 'user:管理员,2018-12-03 18:45:59edit|用户管理员,在2018-08-07 09:53:56修改！|用户管理员,在2018-06-15 11:53:01修改！|用户管理员,在2018-06-15 11:52:16修改！|用户管理员,在2018-06-15 11:35:15修改！', '2018-06-15 11:34:02', '2018-12-03 18:45:59', '1');
 INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
 INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 2f6b3e680..7979d15d4 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -417,13 +417,13 @@ white-space:nowrap;
 									<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
 										<c:forEach items="${serviceList}" var="service" >
 										<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
-										    <c:if test="${service.serviceId ne 5}">
+										    <c:if test="${bean.functionId ne 5}">
 				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96) }" >
 											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
 											</c:if>
 										  </c:if>
-										   <c:if test="${service.serviceId  eq 5}">
-										      <c:if test="${(service.action ne 128) && (service.action ne 96) }" >
+										   <c:if test="${bean.functionId  eq 5}">
+										      <c:if test="${(service.action ne 128) && (service.action ne 96) &&  (service.serviceId ne 37) && (service.serviceId ne 149)  }" >
 											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
 										     </c:if>
 										   </c:if>