接入结束作业票接口

app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -156,4 +156,9 @@ object UrlConsts {
      * 取消作业票
      */
     const val CANCEL_TICKET = "/iscs/ticket/updateJobToCancel"
+
+    /**
+     * 结束作业票
+     */
+    const val FINISH_TICKET = "/iscs/ticket/updateJobToFinish"
 }

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -579,4 +579,24 @@ object NetApi {
             }, isGet = false, isAuth = true
         )
     }
+
+    /**
+     * 结束作业票
+     */
+    fun finishTicket(ticketId: Long, callBack: (Boolean) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.FINISH_TICKET,
+            false,
+            mapOf(
+                "ticketId" to ticketId
+            ),
+            { res, _, _ ->
+                res?.let {
+                    callBack.invoke(true)
+                } ?: run {
+                    callBack.invoke(false)
+                }
+            }, isGet = false, isAuth = true
+        )
+    }
 }

app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt

@@ -83,6 +83,10 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
             presenter?.cancelTicket(mChangePage?.ticketId!!) {
                 changePage(PageChangeBO(-1))
             }
+//            mBinding?.cbCancel?.setText(getString(R.string.finish_the_job))
+//            presenter?.finishTicket(mChangePage?.ticketId!!) {
+//
+//            }
         }
 
         mBinding?.llDetail?.setOnClickListener {
@@ -93,15 +97,18 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
     fun refreshPage(changeBO: PageChangeBO) {
         LogUtil.i("$changeBO")
         mChangePage = changeBO
+
         presenter?.getTicketDetail(changeBO.ticketId) {
             mBinding?.tvTitle?.text = it?.ticketName
         }
+
         presenter?.getStepDetail(changeBO.ticketId!!) {
             mStepList.forEach { step ->
                 step.stepDetail = it?.find { it.stepIndex == step.index }
             }
             mBinding?.rvStep?.adapter?.notifyDataSetChanged()
         }
+
         presenter?.getMachineryDetail(changeBO.machineryId!!,
             {
                 mMachineryDetail = it

app/src/main/java/com/grkj/iscs/view/presenter/StepPresenter.kt

@@ -43,6 +43,14 @@ class StepPresenter : BasePresenter<IStepView>() {
         }
     }
 
+    fun finishTicket(ticketId: Long, callBack: (Boolean) -> Unit) {
+        NetApi.finishTicket(ticketId) {
+            Executor.runOnMain {
+                callBack(it)
+            }
+        }
+    }
+
     /**
      * 获取作业票详细信息
      */

app/src/main/java/com/grkj/iscs/view/widget/CommonBtn.kt

@@ -36,4 +36,8 @@ class CommonBtn(private val ctx: Context, attrs: AttributeSet) : LinearLayout(ct
 
         attrSet.recycle()
     }
+
+    fun setText(text: String) {
+        mBinding.tvName.text = text
+    }
 }