交接班死锁bug提交

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java

@@ -74,11 +74,11 @@ public class StandardWorkTicketConsumer implements IQueueConsume {
                 WorkflowOperationLog workflowOperationLog = new WorkflowOperationLog();
                 BeanUtils.copyProperties(response,workflowOperationLog);
                 if (ObjectUtils.isNotEmpty(workflowOperationLog)) {
-                    regularWorkflowOperationLog.setVariables(JSON.toJSONString(response.getVariables()));
-                    regularWorkflowOperationLog.setTakeId(response.getTaskId());
-                    regularWorkflowOperationLog.setTakeName(response.getTaskName());
-                    regularWorkflowOperationLog.setIsOperationLog(false);
-                    regularWorkflowOperationLog.setProcessInstanceKey(response.getProcessInstanceId());
+                    workflowOperationLog.setVariables(JSON.toJSONString(response.getVariables()));
+                    workflowOperationLog.setTakeId(response.getTaskId());
+                    workflowOperationLog.setTakeName(response.getTaskName());
+                    workflowOperationLog.setIsOperationLog(false);//没保存成功
+                    workflowOperationLog.setProcessInstanceKey(response.getProcessInstanceId());
                     log.info("正在保存到hzims_workflow_operation_log.... :{}", workflowOperationLog);
                     workflowOperationLogService.save(workflowOperationLog);
                 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java

@@ -200,7 +200,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
      * @return 交接班成功标识
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public Boolean changeShift(ImsDutyRecDTO recDTO) {
         // 获取班组组长
         Long managerId = this.getHandleGroupManagerByDuty(recDTO.getDutyId());