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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
zhangwq
2018-12-04 16:43:21 +08:00
parent f3336efea1 6ae81cf820
commit fe65a7ddf5
8 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
View File

@@ -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++){

2
src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
View File

@@ -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++){

4
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -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++){

2
src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
View File

@@ -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++){

2
src/main/java/com/nis/web/controller/report/NtcTagReportController.java
View File

@@ -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++){

2
src/main/java/com/nis/web/controller/report/NtcXzReportController.java
View File

@@ -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++){