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

修改配置新增、修改时的来函、分类、性质、标签都只查询有效状态数据，并且修正性质、标签在修改配置时，下拉列表的加载多次数据的错误。

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-30 15:32:56 +08:00
parent a11ce7f948
commit e71c09be15
4 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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);

3
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -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>

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

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

36
src/main/webapp/WEB-INF/include/form/basicInfo.jsp
View File

@@ -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">
<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
<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>
<%-- <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:forEach>
</select>
</div>
@@ -32,12 +36,20 @@
<option value="${fl.serviceDictId}">${fl.itemValue}</option>
</c:when>
<c:otherwise>
<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: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: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>