部门

9efb1842 · zhangyu · 8c6c8464 · 9efb1842 · 9efb1842 · 9efb1842
Commit 9efb1842 authored Dec 23, 2019 by zhangyu
5 changed files
--- a/WebContent/WEB-INF/views/modules/airline/userDepart.jsp
+++ b/WebContent/WEB-INF/views/modules/airline/userDepart.jsp
@@ -59,8 +59,9 @@
    <tbody>
    <c:forEach items="${page}" var="verify" varStatus="vs">
        <tr>
+            <td>${verify.sort}</td>
            <td>${verify.label}</td>
-            <td>${verify.valueType}</td>
+           <%-- <td>${verify.valueType}</td>--%>
            <td>
            <c:forEach items="${verify.dList}" var="depar" varStatus="ds">
               ${depar.departName}

--- a/WebContent/WEB-INF/views/modules/airline/verifyUserForm.jsp
+++ b/WebContent/WEB-INF/views/modules/airline/verifyUserForm.jsp
@@ -44,7 +44,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li class="active">航线编辑</li>
+    <li class="active">航线部门管理</li>
 </ul>
 <br/>


--- a/src/com/ejweb/modules/airline/service/VerifyAddService.java
+++ b/src/com/ejweb/modules/airline/service/VerifyAddService.java
@@ -28,14 +28,17 @@ public class VerifyAddService extends CrudService<VerifyDao, VerifyEntity> {
    public List<UserDictDepartEntity> findUserDeparDictAllList() {
        List<UserDictEntity> userDictAll = verifyDepartAddDao.getUserDictAll();
        List<UserDictDepartEntity> dictlist = new ArrayList<>();
+        Integer i=1;
        for (UserDictEntity ud : userDictAll) {
            String valueType = ud.getValueType();
            List<UserDepartTypeEntity> userDepartType = verifyDepartAddDao.getUserDepartType(valueType);
            UserDictDepartEntity userDictEntity = new UserDictDepartEntity();
+            userDictEntity.setSort(i);
            userDictEntity.setLabel(ud.getLabel());
            userDictEntity.setValueType(ud.getValueType());
            userDictEntity.setdList(userDepartType);
            dictlist.add(userDictEntity);
+            i++;
        }
        return dictlist;
    }

--- a/src/com/ejweb/modules/depart/dao/DepartDao.java
+++ b/src/com/ejweb/modules/depart/dao/DepartDao.java
@@ -4,13 +4,13 @@ import com.ejweb.core.persistence.CrudDao;
 import com.ejweb.modules.depart.entity.DepartEntity;

 /**
- * 
+ *
 * 论证部门Dao
 * @author zhanglg
 * @version 2016-08-24
 */
 public interface DepartDao extends CrudDao<DepartEntity>{
- 
+
 	public DepartEntity getdepartByName(DepartEntity departEntity);
-	
+
 }
\ No newline at end of file
--- a/src/com/ejweb/modules/depart/entity/UserDictDepartEntity.java
+++ b/src/com/ejweb/modules/depart/entity/UserDictDepartEntity.java
@@ -20,9 +20,17 @@ public class UserDictDepartEntity extends DataEntity<UserDictDepartEntity> {
    private String label;

    private String valueType;
-
+	private Integer sort;
 	private List<UserDepartTypeEntity> dList;

+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
 	public static long getSerialVersionUID() {
 		return serialVersionUID;
 	}