From 964db9ea8bfbb276ae56f7b5c95de753a5bf6ec0 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 30 Nov 2023 15:57:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/supervise/flowable/biz/flow2/FlowRest.java    | 2 +-
 .../supervise/flowable/biz/flowtask/FlowTaskService.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
index c3e678c2..6b95eaa5 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
@@ -45,7 +45,7 @@ public class FlowRest implements FlowFeign {
         formVariables = formVariables == null ? new HashMap<>() : formVariables;
         //发起人的组织全路径
         String orgPath = bv.getOrgSidPath();
-        formVariables.put("createrOrgPath", orgPath);
+//        formVariables.put("createrOrgPath", orgPath);
         formVariables.put("businessSid", bv.getBusinessSid());
         //获取下一环节待办人
         if (StringUtils.isBlank(bv.getNextNodeUserSids())) {
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
index f06f6bc9..d758224d 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
@@ -549,7 +549,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             if(sysUserVoResultBean.getData()!=null){
                 flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
                 flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
-                String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath","");
+                /*String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath","");
                 String ogrName="";
                 if(StringUtils.isNotBlank(createOrgPath)){
                     List<String> stringList = Arrays.asList(createOrgPath.split("/"));
@@ -567,7 +567,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     }
                 }else{
                     flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
-                }
+                }*/
             }
             ResultBean<SysUserVo> sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid);
             flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName());
@@ -782,7 +782,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 flowTask.setEndTime(new Date(end_time_t_l));
             }
             flowTask.setProcessVariables(historicTaskInstance.getProcessVariables());
-            String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath","");
+           /* String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath","");
             String ogrName="";
             if(StringUtils.isNotBlank(createOrgPath)){
                 List<String> stringList = Arrays.asList(createOrgPath.split("/"));
@@ -811,7 +811,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 }else{
                     flowTask.setStartDeptName("");
                 }
-            }
+            }*/
             hisTaskList.add(flowTask);
         }
         page.setTotal(count);

From 862a33393627ba475eeff729ce57df0d4ce3e475 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 30 Nov 2023 16:04:22 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowable/biz/flow/FlowableMapper.java     |  4 +++
 .../flowable/biz/flow/FlowableMapper.xml      |  5 +++
 .../flowable/biz/flow/FlowableService.java    |  5 +++
 .../biz/flowtask/FlowTaskService.java         | 33 ++++++++++++++++++-
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java
index 3fb5cbc5..9e8b7d2d 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java
@@ -3,6 +3,7 @@ package com.yxt.supervise.flowable.biz.flow;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.supervise.flowable.api.flow.FlowProcinst;
 import com.yxt.supervise.flowable.api.flow.Flowable;
+import com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -20,4 +21,7 @@ public interface FlowableMapper extends BaseMapper<Flowable> {
 
     @Select("select * from act_re_procdef where id_=#{id}")
     Map<String, String> getProcessDefByDefId(String processDefinitionId);
+
+    FlowCommentDto selectComment(@Param("type") String type, @Param("taskId") String taskId, @Param("processInstanceId") String processInstanceId,@Param("id") String id);
+
 }
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml
index be269af2..82726be8 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml
@@ -15,6 +15,11 @@
     <select id="getFlowProcinstById" resultType="com.yxt.supervise.flowable.api.flow.FlowProcinst">
         select * from act_hi_procinst where ID_=#{id}
     </select>
+
+    <select id="selectComment" resultType="com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto">
+        select  TYPE_ type,MESSAGE_ comment from act_hi_comment where TYPE_ = #{type} and TASK_ID_ = #{taskId} and PROC_INST_ID_ = #{processInstanceId} and ID_ = #{id}
+        order by TIME_ asc
+    </select>
     <!--
         <insert id="insetFlowableTask">
             insert into `act_ru_task` (`REV`, `EXECUTION_ID`, `PROC_INST_ID`, `PROC_DEF_ID`,
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableService.java
index 1be6f2fa..603a76e7 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableService.java
@@ -3,6 +3,7 @@ package com.yxt.supervise.flowable.biz.flow;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.supervise.flowable.api.flow.*;
+import com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto;
 import com.yxt.supervise.flowable.api.flowtask.FlowTask;
 import com.yxt.supervise.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.supervise.flowable.api.flowtask.LatestTaskVo;
@@ -277,4 +278,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     public Map<String, String> getProcessDefByDefId(String processDefinitionId) {
         return baseMapper.getProcessDefByDefId(processDefinitionId);
     }
+
+    public FlowCommentDto selectComment(String type, String taskId, String processInstanceId, String id) {
+        return baseMapper.selectComment(type,taskId,processInstanceId,id);
+    }
 }
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
index d758224d..a44fb709 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
@@ -355,10 +355,41 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     // 获取意见评论内容
                     List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId());
                     commentList.forEach(comment -> {
-                        if (histIns.getTaskId().equals(comment.getTaskId())) {
+                       /* if (histIns.getTaskId().equals(comment.getTaskId())) {
                             String type = comment.getType();
                             FlowCommentDto build = FlowCommentDto.builder().type(type).comment(comment.getFullMessage()).build();
                             flowTask.setComment(build);
+                        }*/
+                        if (histIns.getTaskId().equals(comment.getTaskId())) {
+                            String type = comment.getType();
+//                            FlowCommentDto build = FlowCommentDto.builder().type(type).comment(comment.getFullMessage()).build();
+                            FlowCommentDto build = flowableService.selectComment(type, histIns.getTaskId(), histIns.getProcessInstanceId(), comment.getId());
+                            if ("4".equals(type)) {//加签委派
+                                FlowTask flowTask1 = new FlowTask();
+                                String userSid = comment.getUserId();
+                                ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(userSid);
+                                String name = "";
+                                String headImg = "";
+                                if (sysUserVoResultBean.getData() != null) {
+                                    name = sysUserVoResultBean.getData().getName();
+                                    headImg = sysUserVoResultBean.getData().getHeadImage();
+                                }
+                                flowTask1.setTaskName("加签审批意见");
+                                List<TaskUserInfo> ll = new ArrayList<>();
+                                TaskUserInfo taskUserInfo = new TaskUserInfo();
+                                taskUserInfo.setAssigneeName(name);
+                                taskUserInfo.setAssigneeSid(userSid);
+                                taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + headImg);
+                                ll.add(taskUserInfo);
+                                build.setComment(build.getComment());
+                                flowTask1.setFinishTime(comment.getTime());
+                                flowTask1.setCreateTime(comment.getTime());
+                                flowTask1.setTaskUserInfos(ll);
+                                flowTask1.setComment(build);
+                                hisFlowList.add(flowTask1);
+                            } else {
+                                flowTask.setComment(build);
+                            }
                         }
                     });
                     hisFlowList.add(flowTask);

From 3c5db53bfdb67f7c63daacd4ec0e24bdf53be146 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 30 Nov 2023 16:07:57 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/supervise/flowable/biz/flowtask/FlowTaskService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
index a44fb709..3589a559 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
@@ -296,8 +296,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             List<HistoricActivityInstance> list = historyService
                     .createHistoricActivityInstanceQuery()
                     .processInstanceId(procInsId)
-                    .orderByHistoricActivityInstanceStartTime()
-                    .desc().list();
+                   /* .orderByHistoricActivityInstanceStartTime()
+                    .desc().list();*/
+                    .list();
            Map<String,String>  processInstance=processService.getProcessInstanceById(procInsId);
             List<FlowTask> hisFlowList = new ArrayList<>();
             for (HistoricActivityInstance histIns : list) {

From a9199b2b01d5dfb0c7851833fbc0b32606bab6e7 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 30 Nov 2023 16:18:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
index 3589a559..b149ac74 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
@@ -355,6 +355,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : FlowableUtils.getDate(histIns.getDurationInMillis()));
                     // 获取意见评论内容
                     List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId());
+                    commentList.sort(Comparator.comparing(Comment::getTime));
                     commentList.forEach(comment -> {
                        /* if (histIns.getTaskId().equals(comment.getTaskId())) {
                             String type = comment.getType();