Эх сурвалжийг харах

添加获取工作票类型

Frankensteinly 1 жил өмнө
parent
commit
8f7087f254

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

@@ -18,6 +18,7 @@ class CreateTicketActivity : BaseMvpActivity<ICreateTicketView, CreateTicketPres
 
     override fun initView() {
         presenter?.getSopList()
+        presenter?.getTicketType()
     }
 
     override fun showSopList(sopList: MutableList<SopPageVO.Record>) {
@@ -30,7 +31,7 @@ class CreateTicketActivity : BaseMvpActivity<ICreateTicketView, CreateTicketPres
                 mBinding?.siLine?.setText(sop.workareaName)
                 mBinding?.siTicketName?.setText("${sop.sopName}-${sop.workshopName}-${sop.workareaName}")
 //                mBinding?.siTicketNumber?.setText(sop.ticketNumber)
-                mBinding?.siTicketType?.setText(sop.sopType)
+                mBinding?.siTicketType?.setText(presenter?.getTicketTypeName(sop.sopType))
 //                mBinding?.siSegregationPoint?.setText(sop.pointList.map { it.name }.toString())
             }
         })

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

@@ -15,6 +15,11 @@ object UrlConsts {
      */
     const val SOP_PAGE = "/iscs/sop/getIsSopPage"
 
+    /**
+     * 查询字典 - 工作票类型
+     */
+    const val TICKET_TYPE = "/system/dict/data/type/ticket_type"
+
 
 
     /**

+ 18 - 0
app/src/main/java/com/grkj/iscs/model/vo/TicketTypeVO.kt

@@ -0,0 +1,18 @@
+package com.grkj.iscs.model.vo
+
+data class TicketTypeVO(
+    val createBy: String,
+    val createTime: String,
+    val default: Boolean,
+    val dictCode: String,
+    val dictLabel: String,
+    val dictSort: String,
+    val dictType: String,
+    val dictValue: String,
+    val isDefault: String,
+    val listClass: String,
+    val params: Params,
+    val status: String
+) {
+    class Params
+}

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

@@ -3,11 +3,13 @@ package com.grkj.iscs.presenter
 import com.grkj.iscs.base.BasePresenter
 import com.grkj.iscs.iview.ICreateTicketView
 import com.grkj.iscs.model.vo.SopPageVO
+import com.grkj.iscs.model.vo.TicketTypeVO
 import com.grkj.iscs.util.NetApi
 
 class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
 
     var mSopList = mutableListOf<SopPageVO.Record>()
+    var mTicketTypeList = mutableListOf<TicketTypeVO>()
 
     fun getSopList() {
         NetApi.getSopPage(0, 10) {
@@ -15,4 +17,14 @@ class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
             mvpView?.showSopList(mSopList)
         }
     }
+
+    fun getTicketType() {
+        NetApi.getTicketType {
+            mTicketTypeList = it as MutableList<TicketTypeVO>
+        }
+    }
+
+    fun getTicketTypeName(type: String): String? {
+        return mTicketTypeList.find { it.dictValue == type }?.dictLabel
+    }
 }

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

@@ -5,6 +5,7 @@ import com.grkj.iscs.model.AreaTree
 import com.grkj.iscs.model.UrlConsts
 import com.grkj.iscs.model.vo.BaseVO
 import com.grkj.iscs.model.vo.SopPageVO
+import com.grkj.iscs.model.vo.TicketTypeVO
 
 
 /**
@@ -38,4 +39,16 @@ object NetApi {
                 }
             }, isGet = true, isAuth = true)
     }
+
+    fun getTicketType(callBack: (MutableList<TicketTypeVO>?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.TICKET_TYPE,
+            false,
+            mapOf<String,String>(),
+            { res, errMsg, codeInt ->
+                res?.let {
+                    callBack.invoke(getRefBean(it))
+                }
+            }, isGet = true, isAuth = true)
+    }
 }