From 3b4613e988daf0442b12791a199b098383f33456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com>
Date: Mon, 10 Jul 2023 16:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../middle/processflow/consumer/StandardWorkTicketConsumer.java     | 6 ++++++
 hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql          | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java
index ad38337..7f55a09 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java
@@ -48,7 +48,10 @@ public class StandardWorkTicketConsumer implements IQueueConsume {
         BeanUtils.copyProperties(response,regularWorkflowOperationLog);
         if (ObjectUtils.isNotEmpty(regularWorkflowOperationLog)) {
             regularWorkflowOperationLog.setVariables(JSON.toJSONString(response.getVariables()));
+            regularWorkflowOperationLog.setTakeId(response.getTaskId());
+            regularWorkflowOperationLog.setTakeName(response.getTaskName());
             regularWorkflowOperationLog.setIsOperationLog(true);
+            regularWorkflowOperationLog.setProcessInstanceKey(response.getProcessInstanceId());
             log.info("正在记录操作日志WorkflowOperationLog.... :{}", regularWorkflowOperationLog);
             workflowOperationLogService.save(regularWorkflowOperationLog);
         }
@@ -72,7 +75,10 @@ public class StandardWorkTicketConsumer implements IQueueConsume {
                 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());
                     log.info("正在保存到hzims_workflow_operation_log.... :{}", workflowOperationLog);
                     workflowOperationLogService.save(workflowOperationLog);
                 }
diff --git a/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql b/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql
index 3b40c96..a3478ce 100644
--- a/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql
+++ b/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql
@@ -1 +1 @@
-alter table  hzims_workflow_operation_log add  is_operation_log tinyint(1) comment '0 正常日志 1 错误日志';
\ No newline at end of file
+alter table  hzims_workflow_operation_log add  is_operation_log tinyint(1) comment '1 正常日志 0 错误日志';
\ No newline at end of file