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

refactor(更新)
- 作业异常取消可以继续作业

周文健 4 сар өмнө
parent
commit
3cb6a58b3c

+ 6 - 0
data/src/main/java/com/grkj/data/dao/JobTicketDao.kt

@@ -435,6 +435,12 @@ interface JobTicketDao {
     @Query("update is_job_ticket set ticket_status = :ticketStatus,ex_status = :exStatus where ticket_id = :sourceDataId")
     @Query("update is_job_ticket set ticket_status = :ticketStatus,ex_status = :exStatus where ticket_id = :sourceDataId")
     fun updateJobTicketExceptionData(sourceDataId: Long, ticketStatus: String, exStatus: Int?)
     fun updateJobTicketExceptionData(sourceDataId: Long, ticketStatus: String, exStatus: Int?)
 
 
+    /**
+     * 取消作业票异常
+     */
+    @Query("update is_job_ticket set ex_status = null where ticket_id = :sourceDataId")
+    fun cancelJobTicketException(sourceDataId: Long)
+
     /**
     /**
      * 获取所有进行中的作业
      * 获取所有进行中的作业
      */
      */

+ 1 - 5
data/src/main/java/com/grkj/data/repository/impl/standard/ExceptionRepository.kt

@@ -63,11 +63,7 @@ class ExceptionRepository @Inject constructor(
                     }
                     }
 
 
                     CommonDictDataEnum.EXCEPTION_SOURCE_TYPE.commonDictRes.find { it.dictLabel == "作业" }?.dictValue?.toInt() -> {
                     CommonDictDataEnum.EXCEPTION_SOURCE_TYPE.commonDictRes.find { it.dictLabel == "作业" }?.dictValue?.toInt() -> {
-                        jobTicketDao.updateJobTicketExceptionData(
-                            exceptionSource.sourceDataId,
-                            JobTicketStatusEnum.CANCELED.status,
-                            CommonDictDataEnum.EXCEPTION_STATUS.commonDictRes.find { it.dictLabel == "已取消" }?.dictValue?.toInt()
-                        )
+                        jobTicketDao.cancelJobTicketException(exceptionSource.sourceDataId)
                     }
                     }
                 }
                 }
             }
             }