From 309b5907459774c18a014f2f22bfc0596bb4ff2d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 14 Mar 2024 16:46:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20hiwork=E6=B6=88=E6=81=AF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Eflowid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/docking/hiwork/entity/HiworkTodo.java    | 2 ++
 .../docking/hiwork/service/impl/HiworkTodoServiceImpl.java    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java
index c184fd81..466cf350 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java
@@ -26,6 +26,8 @@ public class HiworkTodo {
     private String noticeDescription;
     @ApiModelProperty(value = "流程编号")
     private String busiDefCode;
+    @ApiModelProperty(value = "流程id")
+    private String flowid;
     @ApiModelProperty(value = "流程实例id")
     private String processId;
     @ApiModelProperty(value = "流程实例名称")
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
index 12cc9bd3..20edd1ce 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.jero.modules.docking.hiwork.service.impl;
 
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -31,7 +30,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
@@ -136,6 +134,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
         String date = DateUtil.formatDateTime(new Date());
         String noticeTitle = processAll.getPrcName() + "(" + loginUser.getRealname() + " " + date + ")";
         hiworkTodo.setNoticeTitle(noticeTitle);
+        hiworkTodo.setFlowid(processAll.getProcessInstanceId());
         hiworkTodo.setProcessId(processAll.getProcessInstanceId());
         hiworkTodo.setProcessName(ProcessTypeEnum.getNameByValue(processAll.getPrcType()));
         hiworkTodo.setProcessType(PROCESS_TYPE);
@@ -185,6 +184,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
         String date = DateUtil.formatDateTime(new Date());
         String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getRealname() + " " + date + ")";
         hiworkTodo.setNoticeTitle(noticeTitle);
+        hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId());
         hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId());
         hiworkTodo.setProcessType(PROCESS_TYPE);
         hiworkTodo.setTaskId(processApprovalRecord.getTaskId());