Browse Source

添加获取部门列表

Frankensteinly 1 year ago
parent
commit
17193ba848

+ 1 - 0
app/src/main/java/com/grkj/iscs/activity/CreateTicketActivity.kt

@@ -43,6 +43,7 @@ class CreateTicketActivity : BaseMvpActivity<ICreateTicketView, CreateTicketPres
                 mBinding?.tvStartTime?.text.toString(),
                 mBinding?.tvEndTime?.text.toString(),
                 mBinding?.siSegregationPoint?.getText().toString().replace("[", "").replace("]", ""),
+                // TODO 待补充
                 null
             )
             presenter?.createTicket(ticketVO)

+ 5 - 0
app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -37,6 +37,11 @@ object UrlConsts {
      */
     const val USER_LIST = "/system/user/list"
 
+    /**
+     * 获取部门列表
+     */
+    const val DEPT_List = "/system/dept/list"
+
     /**
      * 创建工作票
      */

+ 0 - 2
app/src/main/java/com/grkj/iscs/model/vo/CreateTicketReqVO.kt

@@ -1,7 +1,5 @@
 package com.grkj.iscs.model.vo
 
-import java.util.Date
-
 data class CreateTicketReqVO(
     val ticketCode: String?,
     val ticketName: String?,

+ 28 - 0
app/src/main/java/com/grkj/iscs/model/vo/DeptListRespVO.kt

@@ -0,0 +1,28 @@
+package com.grkj.iscs.model.vo
+
+data class DeptListRespVO(
+    /** 部门ID */
+    val deptId: Long?,
+    /** 父部门ID  */
+    val parentId: Long?,
+    /** 祖级列表  */
+    val ancestors: String?,
+    /** 部门名称  */
+    val deptName: String?,
+    /** 显示顺序  */
+    val orderNum: String?,
+    /** 负责人  */
+    val leader: String?,
+    /** 联系电话  */
+    val phone: String?,
+    /** 邮箱  */
+    val email: String?,
+    /** 部门状态:0正常,1停用  */
+    val status: String?,
+    /** 删除标志(0代表存在 2代表删除)  */
+    val delFlag: String?,
+    /** 父部门名称  */
+    val parentName: String?,
+    /** 子部门  */
+    val children: List<DeptListRespVO> = mutableListOf()
+)

+ 0 - 4
app/src/main/java/com/grkj/iscs/model/vo/SopPageRespVO.kt

@@ -10,10 +10,6 @@ data class SopPageRespVO(
     val size: Int,
     val total: Int
 ) {
-    override fun toString(): String {
-        return "SopPageVO(current=$current, optimizeCountSql=$optimizeCountSql, orders=$orders, pages=$pages, records=$records, searchCount=$searchCount, size=$size, total=$total)"
-    }
-
     data class Record(
         val createBy: String,
         val createTime: String,

+ 4 - 0
app/src/main/java/com/grkj/iscs/presenter/CreateTicketPresenter.kt

@@ -31,6 +31,10 @@ class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
         NetApi.getUserList(0, 10) {
             mvpView?.updateLockerList(it?.rows?.map { it.nickName })
         }
+
+        NetApi.getDeptList(0, 10) {
+            println("getDeptList : $it")
+        }
     }
 
     fun getAutoCode(callBack: (String?) -> Unit) {

+ 41 - 0
app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -3,6 +3,7 @@ package com.grkj.iscs.util
 import com.grkj.iscs.MyApplication
 import com.grkj.iscs.model.Token
 import com.grkj.iscs.model.UrlConsts
+import com.grkj.iscs.model.vo.DeptListRespVO
 import com.grkj.iscs.model.vo.SopInfoRespVO
 import com.grkj.iscs.model.vo.SopPageRespVO
 import com.grkj.iscs.model.vo.TicketTypeRespVO
@@ -12,6 +13,9 @@ import com.grkj.iscs.model.vo.UserListRespVO
  * 网络请求
  */
 object NetApi {
+    /**
+     * 登录
+     */
     fun login() {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.SIGN_IN,
@@ -28,6 +32,9 @@ object NetApi {
             }, isGet = false, isAuth = false)
     }
 
+    /**
+     * 获取SOP分页
+     */
     fun getSopPage(current: Int, size: Int, callBack: (SopPageRespVO?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.SOP_PAGE,
@@ -43,6 +50,9 @@ object NetApi {
             }, isGet = true, isAuth = true)
     }
 
+    /**
+     * 获取工作票类型
+     */
     fun getTicketType(callBack: (MutableList<TicketTypeRespVO>?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.TICKET_TYPE,
@@ -55,6 +65,9 @@ object NetApi {
             }, isGet = true, isAuth = true)
     }
 
+    /**
+     * 获取一个自动编号
+     */
     fun getAutoCode(type: String, callBack: (String?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.AUTO_CODE + "/" +type,
@@ -67,6 +80,9 @@ object NetApi {
             }, isGet = true, isAuth = true)
     }
 
+    /**
+     * 获取SOP详情
+     */
     fun getSopInfo(sopId: Long, callBack: (SopInfoRespVO?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.SOP_INFO,
@@ -81,6 +97,9 @@ object NetApi {
             }, isGet = true, isAuth = true)
     }
 
+    /**
+     * 获取用户列表
+     */
     fun getUserList(pageNum: Int, pageSize: Int, callBack: (UserListRespVO?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.USER_LIST,
@@ -96,6 +115,28 @@ object NetApi {
             }, isGet = true, isAuth = true)
     }
 
+    /**
+     * 获取部门列表
+     */
+    fun getDeptList(pageNum: Int, pageSize: Int, callBack: (MutableList<DeptListRespVO>?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.DEPT_List,
+            false,
+            mapOf(
+                "pageNum" to pageNum,
+                "pageSize" to pageSize
+            ),
+            { res, errMsg, codeInt ->
+                res?.let {
+                    callBack.invoke(getRefBean(it))
+                }
+            }, isGet = true, isAuth = true
+        )
+    }
+
+    /**
+     * 创建工作票
+     */
     fun createTicket() {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.CREATE_TICKET,