监管流程部分接口

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);
+
 }

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`,

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);
+    }
 }

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);