yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
9b60fd5ef2 a9199b2b01
commit
bea3ab09ef
5 changed files with 55 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java
  2. 5
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml
  3. 5
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableService.java
  4. 2
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
  5. 47
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java

4
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java
View File

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

5
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml
View File

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

5
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableService.java
View File

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

2
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
View File

@ -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())) {

47
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java
View File

@ -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) {
@ -354,11 +355,43 @@ 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())) {
/* 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);
@ -549,7 +582,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 +600,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 +815,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 +844,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}else{
flowTask.setStartDeptName("");
}
}
}*/
hisTaskList.add(flowTask);
}
page.setTotal(count);

Write Preview
Loading…
Cancel
Save