diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 824c28fd1..3d0047694 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -373,13 +373,13 @@ public class BaseController { List areaIspList=new ArrayList(); getAreaIsps(areaEffectiveIds,areaIspList,isps,areas); model.addAttribute("_areaIsps", areaIspList); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo();//只查询有效的 model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findAllFlDict(); + List fls=serviceDictInfoService.findFlDict();//只查询有效分类字典 model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findAllXzDict(); + List xzs=serviceDictInfoService.findXzDict();//只查询有效性质字典 model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findAllLableDict(); + List lables=serviceDictInfoService.findLableDict();//只查询有效标签字典 model.addAttribute("lables", lables); List regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId()); model.addAttribute("regionList", regionList); 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 890f20906..1ecb56c0a 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -63,6 +63,9 @@ AND r.is_audit=${isAudit} + + AND r.is_valid=${isValid} + AND r.request_time between #{beginDate} and #{endDate} 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 47c997552..a772db616 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -106,6 +106,7 @@ public class RequestInfoService extends BaseService{ public List getValidRequestInfo(){ RequestInfo requestInfo=new RequestInfo(); requestInfo.setIsValid(Constants.VALID_YES); +// requestInfo.setIsAudit(Constants.AUDIT_YES); return requestInfoDao.findRequestInfo(requestInfo); } public List getAllRequestInfo(){ diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 28c902426..1c2702e02 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -10,9 +10,13 @@ @@ -32,12 +36,20 @@ - + + <%-- + >${fl.itemValue} --%> @@ -60,12 +72,20 @@ - + + > + ${xz.itemValue} + + + <%-- - + --%> @@ -84,12 +104,20 @@ - + + > + ${lable.itemValue} + + + <%-- - + --%>