refactor(更新)

- 选择人员的自动确认和点击确认无法继续的问题处理

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobExecuteFragment.kt

@@ -654,11 +654,14 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
             viewModel.updateLockerAndColockerData().observe(this) {
                 val workflowStep =
                     viewModel.workflowSteps.find { it.stepId == viewModel.currentStepData?.workflowStepId }
-                if ((workflowStep?.confirmType != 0 || (workflowStep.confirmRoleCode != null && MainDomainData.roleKeys?.contains(
-                        workflowStep.confirmRoleCode.toString()
-                    ) == true) || (workflowStep.confirmRoleCode != null && MainDomainData.roleKeys?.contains(
-                        workflowStep.confirmRoleCode.toString()
-                    ) == true && workflowStep.confirmUser != null && MainDomainData.userInfo?.userId == workflowStep.confirmUser)) &&
+                if ((workflowStep?.confirmType != 0 ||//自动确认
+                            (workflowStep.confirmRoleCode == null && workflowStep.confirmUser == null) ||//点击确认
+                            (workflowStep.confirmRoleCode != null && MainDomainData.roleKeys?.contains(
+                                workflowStep.confirmRoleCode.toString()
+                            ) == true) ||//角色确认
+                            (workflowStep.confirmRoleCode != null && MainDomainData.roleKeys?.contains(
+                                workflowStep.confirmRoleCode.toString()
+                            ) == true && workflowStep.confirmUser != null && MainDomainData.userInfo?.userId == workflowStep.confirmUser)) &&//人员确认
                     (workflowStep?.enableSetLocker == true || workflowStep?.enableSetColocker == true)
                 ) {
                     viewModel.currentStepData?.stepStatus = "1"

data/src/main/java/com/grkj/data/repository/impl/network/NetworkJobTicketRepository.kt

@@ -224,4 +224,8 @@ class NetworkJobTicketRepository  @Inject constructor() : BaseRepository(), IJob
     override fun getUserIdByCardRfid(rfid: String): Long? {
         TODO("Not yet implemented")
     }
+
+    override fun getExceptionIdByTicketId(ticketId: Long): Long {
+        TODO("Not yet implemented")
+    }
 }