补充结束作业票对冲突的作业票的提示

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

@@ -98,8 +98,18 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
                     if (it) changePage(PageChangeBO(-1))
                 }
             } else if (mStep == 8) {
-                presenter?.finishTicket(mChangePage?.ticketId!!) {
-                    if (it) changePage(PageChangeBO(-1))
+                if (mStepList.find { it.index == 8 }?.stepDetail?.conflictJobNum != 0) {
+                    mTipDialog.setTip(getString(R.string.action_confirm_finish_ticket))
+                    mTipDialog.setConfirmListener {
+                        presenter?.finishTicket(mChangePage?.ticketId!!) {
+                            if (it) changePage(PageChangeBO(-1))
+                        }
+                    }
+                    mTipDialog.show()
+                } else {
+                    presenter?.finishTicket(mChangePage?.ticketId!!) {
+                        if (it) changePage(PageChangeBO(-1))
+                    }
                 }
             }
         }