①修复新增,修改,列表展示配置时分类性质标签展示的问题

②列表展示时采用遍历分类性质标签的方法展示,减少数据库查询时的压力
③取掉了一些不需要展示的列
④新增Maat转换的bean
⑤采用gson的方式对在bean上做注解做转换,禁止了htmlescape
This commit is contained in:
wangxin
2018-03-05 16:30:16 +08:00
parent 363544a443
commit 848087dbef
33 changed files with 797 additions and 218 deletions

View File

@@ -24,10 +24,25 @@
<div class="col-md-8">
<select name="classify" multiple class="selectpicker form-control" title="--请选择--">
<c:forEach items="${fls}" var="fl">
<option value="${fl.item_code}"
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
<c:if test="${fl.item_code==_cfg.classify}">selected</c:if>
>${fl.item_value}</option>
<c:choose>
<c:when test="${_cfg.classify==null or _cfg.classify==''}">
<option value="${fl.itemCode}">${fl.itemValue}</option>
</c:when>
<c:when test="${fn:contains(_cfg.classify,',')}">
<option value="${fl.itemCode}"
<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
<c:if test="${fl.itemCode==_classify}">selected</c:if>
</c:forEach>
>${fl.itemValue}</option>
</c:when>
<c:otherwise>
<option value="${fl.itemCode}"
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
<c:if test="${fl.itemCode==_classify}">selected</c:if>
>${fl.itemValue}</option>
</c:otherwise>
</c:choose>
</c:forEach>
</select>
</div>
@@ -43,10 +58,19 @@
<div class="col-md-8">
<select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
<c:forEach items="${xzs}" var="xz">
<option value="${xz.item_code}"
<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
<c:if test="${xz.item_code==_cfg.attribute}">selected</c:if>
>${xz.item_value}</option>
<c:choose>
<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
<option value="${xz.itemCode}">${xz.itemValue}</option>
</c:when>
<c:otherwise>
<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
<option value="${xz.itemCode}"
<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
<c:if test="${xz.itemCode==_attribute}">selected</c:if>
>${xz.itemValue}</option>
</c:forEach>
</c:otherwise>
</c:choose>
</c:forEach>
</select>
</div>
@@ -58,11 +82,21 @@
<div class="col-md-8">
<select name="lable" multiple class="selectpicker form-control" title="--请选择--">
<c:forEach items="${lables}" var="lable">
<option value="${lable.item_code}"
<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
<c:if test="${lable.item_code==_cfg.lable}">selected</c:if>
>${lable.item_value}</option>
</c:forEach>
<c:choose>
<c:when test="${_cfg.lable==null or _cfg.lable==''}">
<option value="${lable.itemCode}">${lable.itemValue}</option>
</c:when>
<c:otherwise>
<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
<option value="${lable.itemCode}"
<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
<c:if test="${lable.itemCode==_lable}">selected</c:if>
>${lable.itemValue}</option>
</c:forEach>
</c:otherwise>
</c:choose>
</c:forEach>
</select>
</div>
</div>