Commit 9efb1842 by zhangyu

部门

parent 8c6c8464
...@@ -59,8 +59,9 @@ ...@@ -59,8 +59,9 @@
<tbody> <tbody>
<c:forEach items="${page}" var="verify" varStatus="vs"> <c:forEach items="${page}" var="verify" varStatus="vs">
<tr> <tr>
<td>${verify.sort}</td>
<td>${verify.label}</td> <td>${verify.label}</td>
<td>${verify.valueType}</td> <%-- <td>${verify.valueType}</td>--%>
<td> <td>
<c:forEach items="${verify.dList}" var="depar" varStatus="ds"> <c:forEach items="${verify.dList}" var="depar" varStatus="ds">
${depar.departName} ${depar.departName}
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</head> </head>
<body> <body>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active">航线编辑</li> <li class="active">航线部门管理</li>
</ul> </ul>
<br/> <br/>
......
...@@ -28,14 +28,17 @@ public class VerifyAddService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -28,14 +28,17 @@ public class VerifyAddService extends CrudService<VerifyDao, VerifyEntity> {
public List<UserDictDepartEntity> findUserDeparDictAllList() { public List<UserDictDepartEntity> findUserDeparDictAllList() {
List<UserDictEntity> userDictAll = verifyDepartAddDao.getUserDictAll(); List<UserDictEntity> userDictAll = verifyDepartAddDao.getUserDictAll();
List<UserDictDepartEntity> dictlist = new ArrayList<>(); List<UserDictDepartEntity> dictlist = new ArrayList<>();
Integer i=1;
for (UserDictEntity ud : userDictAll) { for (UserDictEntity ud : userDictAll) {
String valueType = ud.getValueType(); String valueType = ud.getValueType();
List<UserDepartTypeEntity> userDepartType = verifyDepartAddDao.getUserDepartType(valueType); List<UserDepartTypeEntity> userDepartType = verifyDepartAddDao.getUserDepartType(valueType);
UserDictDepartEntity userDictEntity = new UserDictDepartEntity(); UserDictDepartEntity userDictEntity = new UserDictDepartEntity();
userDictEntity.setSort(i);
userDictEntity.setLabel(ud.getLabel()); userDictEntity.setLabel(ud.getLabel());
userDictEntity.setValueType(ud.getValueType()); userDictEntity.setValueType(ud.getValueType());
userDictEntity.setdList(userDepartType); userDictEntity.setdList(userDepartType);
dictlist.add(userDictEntity); dictlist.add(userDictEntity);
i++;
} }
return dictlist; return dictlist;
} }
......
...@@ -4,13 +4,13 @@ import com.ejweb.core.persistence.CrudDao; ...@@ -4,13 +4,13 @@ import com.ejweb.core.persistence.CrudDao;
import com.ejweb.modules.depart.entity.DepartEntity; import com.ejweb.modules.depart.entity.DepartEntity;
/** /**
* *
* 论证部门Dao * 论证部门Dao
* @author zhanglg * @author zhanglg
* @version 2016-08-24 * @version 2016-08-24
*/ */
public interface DepartDao extends CrudDao<DepartEntity>{ public interface DepartDao extends CrudDao<DepartEntity>{
public DepartEntity getdepartByName(DepartEntity departEntity); public DepartEntity getdepartByName(DepartEntity departEntity);
} }
\ No newline at end of file
...@@ -20,9 +20,17 @@ public class UserDictDepartEntity extends DataEntity<UserDictDepartEntity> { ...@@ -20,9 +20,17 @@ public class UserDictDepartEntity extends DataEntity<UserDictDepartEntity> {
private String label; private String label;
private String valueType; private String valueType;
private Integer sort;
private List<UserDepartTypeEntity> dList; private List<UserDepartTypeEntity> dList;
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment