|
|
@@ -572,8 +572,7 @@ object BleBusinessManager {
|
|
|
RepositoryManager.workflowRepository.getStepsByMode(
|
|
|
jobTicketData.modeId!!
|
|
|
)
|
|
|
- var currentWorkflowStep =
|
|
|
- workflowSteps.find { it.stepId == ticketStepDataVo?.workflowStepId }
|
|
|
+ var currentWorkflowStep = ticketStepDataVo
|
|
|
val ticketPoints =
|
|
|
RepositoryManager.jobTicketRepo.getTicketDetail(jobTicketData.ticketId)?.ticketPointsVOList
|
|
|
if (currentWorkflowStep?.enableReleaseColock == true && currentWorkflowStep.enableUnlock == true ||
|
|
|
@@ -593,9 +592,7 @@ object BleBusinessManager {
|
|
|
RepositoryManager.jobTicketRepo.getJobTicketStepDataByTicketId(
|
|
|
jobTicketData.ticketId
|
|
|
)
|
|
|
- currentWorkflowStep = workflowSteps.find {
|
|
|
- it.stepId == ticketStep.firstOrNull { it.stepStatus == "0" }?.workflowStepId
|
|
|
- }
|
|
|
+ currentWorkflowStep = ticketStep.firstOrNull { it.stepStatus == "0" }
|
|
|
RepositoryManager.jobTicketRepo.updateTicketDataStatus(
|
|
|
ticketId,
|
|
|
currentWorkflowStep?.getTicketStatus()?.toInt()
|
|
|
@@ -693,8 +690,7 @@ object BleBusinessManager {
|
|
|
)
|
|
|
val ticketPoints =
|
|
|
RepositoryManager.jobTicketRepo.getTicketDetail(data.taskCode?.toLong()!!)?.ticketPointsVOList
|
|
|
- var currentWorkflowStep =
|
|
|
- workflowSteps.find { it.stepId == ticketStepDataVo?.workflowStepId }
|
|
|
+ var currentWorkflowStep = ticketStepDataVo
|
|
|
if ((currentWorkflowStep?.enableLock == true && currentWorkflowStep.enableColock == true) ||
|
|
|
(currentWorkflowStep?.enableReleaseColock == true && currentWorkflowStep.enableUnlock == true ||
|
|
|
ticketPoints?.all { it.pointStatus == ticketPoints.firstOrNull()?.pointStatus } == false)
|
|
|
@@ -713,9 +709,7 @@ object BleBusinessManager {
|
|
|
RepositoryManager.jobTicketRepo.getJobTicketStepDataByTicketId(
|
|
|
jobTicketData.ticketId
|
|
|
)
|
|
|
- currentWorkflowStep = workflowSteps.find {
|
|
|
- it.stepId == ticketStep.firstOrNull { it.stepStatus == "0" }?.workflowStepId
|
|
|
- }
|
|
|
+ currentWorkflowStep = ticketStep.firstOrNull { it.stepStatus == "0" }
|
|
|
RepositoryManager.jobTicketRepo.updateTicketDataStatus(
|
|
|
data.taskCode?.toLong()!!,
|
|
|
currentWorkflowStep?.getTicketStatus()?.toInt()
|