refactor(修改)

- 异常上报问题修改
- 钥匙管理查询条件修改

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionJobFragment.kt

@@ -398,7 +398,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
         val ticketId = GlobalDataTempStore.getInstance()
             .getData<Long>(DataTransferConstants.KEY_JOB_TICKET_ID)
         val exceptionId = GlobalDataTempStore.getInstance()
-            .getData<Int>(DataTransferConstants.KEY_EXCEPTION_ID)
+            .getData<Long>(DataTransferConstants.KEY_EXCEPTION_ID)
         if (ticketId == null) {
             PopTip.tip(R.string.job_lost)
             navController.popBackStack()
@@ -410,8 +410,8 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
             return
         }
         viewModel.getWorkflowModes().observe(this) {
-            viewModel.ticketId = ticketId as Long
-            viewModel.exceptionId = exceptionId as Long
+            viewModel.ticketId = ticketId.toLong()
+            viewModel.exceptionId = exceptionId.toLong()
             getData()
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionViewModel.kt

@@ -354,7 +354,6 @@ class ExceptionViewModel @Inject constructor(
                 exceptionSourceData.sourceDataType = exceptionSource.sourceDataType
                 exceptionRepository.saveExceptionSourceData(exceptionSourceData)
             }
-            exceptionRepository.reportException(exceptionData)
             emit(true)
         }
     }

data/src/main/java/com/grkj/data/dao/JobTicketDao.kt

@@ -599,10 +599,10 @@ interface JobTicketDao {
         select ijt.ticket_id
         from is_job_ticket ijt
         left join is_job_ticket_points ijtp on ijt.ticket_id = ijtp.ticket_id
-        where ijtp.point_id in (:pointIds)
+        where ijtp.point_id in (:pointIds) and ticket_id != :ticketId
     """
     )
-    fun getProgressTicketIdsByPoints(pointIds: List<Long?>): List<Long>
+    fun getProgressTicketIdsByPointsAndExceptTicketId(ticketId: Long, pointIds: List<Long?>): List<Long>
 
     /**
      * 更新作业票挂锁数据

data/src/main/java/com/grkj/data/repository/impl/standard/JobTicketRepository.kt

@@ -327,7 +327,7 @@ class JobTicketRepository @Inject constructor(
 
     override fun hasJobCross(ticketId: Long): Boolean {
         val points = jobTicketDao.getJobTicketPointsDataByTicketId(ticketId)
-        val ticketIds = jobTicketDao.getProgressTicketIdsByPoints(points.map { it.pointId })
+        val ticketIds = jobTicketDao.getProgressTicketIdsByPointsAndExceptTicketId(ticketId,points.map { it.pointId })
         return ticketIds.size > 1
     }