From e71c09be15f4f74b69c65de89c6632066cef0302 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Sat, 30 Jun 2018 15:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=B6=E7=9A=84=E6=9D=A5?=
 =?UTF-8?q?=E5=87=BD=E3=80=81=E5=88=86=E7=B1=BB=E3=80=81=E6=80=A7=E8=B4=A8?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E9=83=BD=E5=8F=AA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E4=BF=AE=E6=AD=A3=E6=80=A7=E8=B4=A8=E3=80=81?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=9C=A8=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=9A=E6=AC=A1=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 .../nis/web/controller/BaseController.java    |  8 ++--
 .../web/dao/configuration/RequestInfoDao.xml  |  3 ++
 .../configuration/RequestInfoService.java     |  1 +
 .../webapp/WEB-INF/include/form/basicInfo.jsp | 44 +++++++++++++++----
 4 files changed, 44 insertions(+), 12 deletions(-)

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<AreaBean> areaIspList=new ArrayList<AreaBean>();
 		getAreaIsps(areaEffectiveIds,areaIspList,isps,areas);
 		model.addAttribute("_areaIsps", areaIspList);
-		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+		List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();//只查询有效的
 		model.addAttribute("requestInfos", requestInfos);
-		List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
+		List<ServiceDictInfo> fls=serviceDictInfoService.findFlDict();//只查询有效分类字典
 		model.addAttribute("fls", fls);
-		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
+		List<ServiceDictInfo> xzs=serviceDictInfoService.findXzDict();//只查询有效性质字典
 		model.addAttribute("xzs", xzs);
-		List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
+		List<ServiceDictInfo> lables=serviceDictInfoService.findLableDict();//只查询有效标签字典
 		model.addAttribute("lables", lables);
 		List<FunctionRegionDict> 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 @@
 	<if test="isAudit != null">
 			AND r.is_audit=${isAudit}
 	</if>
+	<if test="isValid != null">
+			AND r.is_valid=${isValid}
+	</if>
 	<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
 			AND r.request_time between #{beginDate} and #{endDate}
  	</if>
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<RequestInfo> getValidRequestInfo(){
 		RequestInfo requestInfo=new RequestInfo();
 		requestInfo.setIsValid(Constants.VALID_YES);
+//		requestInfo.setIsAudit(Constants.AUDIT_YES);
 		return requestInfoDao.findRequestInfo(requestInfo);
 	}
 	public List<RequestInfo> 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 @@
                <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
                		<option value=""><spring:message code="select"/></option>
                	<c:forEach items="${requestInfos}" var="requestInfo">
-               		<option value="${requestInfo.id}"
+               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
+               			<option value="${requestInfo.id}" 
+               		 	<c:if test="${requestInfo.id==_cfg.requestId}">selected</c:if>>${requestInfo.requestTitle}</option>
+               		</c:if>
+               		<%-- <option value="${requestInfo.id}"
                		 <c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>
-               		 <c:if test="${requestInfo.id==_cfg.requestId}">selected</c:if>>${requestInfo.requestTitle}</option>
+               		 <c:if test="${requestInfo.id==_cfg.requestId}">selected</c:if>>${requestInfo.requestTitle}</option> --%>
                	</c:forEach>
                </select>
            </div>
@@ -32,12 +36,20 @@
                				<option value="${fl.serviceDictId}">${fl.itemValue}</option>
                			</c:when>
                			<c:otherwise>
-               			<option value="${fl.serviceDictId}"
+               				<c:if test="${fl.isValid!=0}">
+               					<option value="${fl.serviceDictId}"
+		               				<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
+				               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
+		               				</c:forEach>>
+		               				${fl.itemValue}
+		               			</option>
+               				</c:if>
+               			<%-- <option value="${fl.serviceDictId}"
                				<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
 		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
 		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
                				</c:forEach>
-               			>${fl.itemValue}</option>	
+               			>${fl.itemValue}</option>	 --%>
                			</c:otherwise>
                		</c:choose>
                	</c:forEach>
@@ -60,12 +72,20 @@
 	               				<option value="${xz.serviceDictId}">${xz.itemValue}</option>
 	               			</c:when>
 	               			<c:otherwise>
-	               				<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
+	               				<c:if test="${xz.isValid!=0}">
+	               					<option value="${xz.serviceDictId}"
+			               				<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
+					               			<c:if test="${fn:trim(xz.serviceDictId) eq _attribute}">selected</c:if>
+			               				</c:forEach>>
+			               				${xz.itemValue}
+			               			</option>
+	               				</c:if>
+	               				<%-- <c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
 	               				<option value="${xz.serviceDictId}"
 	               				<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
 	               		 		<c:if test="${fn:trim(xz.serviceDictId) eq _attribute}">selected</c:if>
 	               				>${xz.itemValue}</option>
-	               				</c:forEach>
+	               				</c:forEach> --%>
 	               			</c:otherwise>
 	               		</c:choose>
                		</c:forEach>
@@ -84,12 +104,20 @@
 	               				<option value="${lable.serviceDictId}">${lable.itemValue}</option>
 	               			</c:when>
 	               			<c:otherwise>
-	               				<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
+	               				<c:if test="${lable.isValid!=0}">
+	               					<option value="${lable.serviceDictId}"
+			               				<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
+					               			<c:if test="${fn:trim(lable.serviceDictId) eq _lable}">selected</c:if>
+			               				</c:forEach>>
+			               				${lable.itemValue}
+			               			</option>
+	               				</c:if>
+	               				<%-- <c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
 	               					<option value="${lable.serviceDictId}"
 			               			<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
 				               		<c:if test="${fn:trim(lable.serviceDictId) eq _lable}">selected</c:if>
 				               		>${lable.itemValue}</option>
-	               				</c:forEach>
+	               				</c:forEach> --%>
 	               			</c:otherwise>
 	               		</c:choose>