yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

master
dimengzhe 2 months ago
parent
b0e9b835cb
commit
0b6360d676
3 changed files with 61 additions and 6 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. 2
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java
  2. 4
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
  3. 61
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

2
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java
View File

@ -44,4 +44,6 @@ public interface FlowTaskMapper extends BaseMapper<FlowTask> {
Map<String, Object> getTaskByDefKey(@Param("procId")String processInstanceId, @Param("taskId")String id);
Map<String, Object> getActHiVarinstForOrgPath(@Param("taskId")String taskId);
List<String> selectAssignee(@Param("taskDefKey") String taskDefKey, @Param("procInsId") String procInsId);
}

4
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
View File

@ -277,4 +277,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
ahv.task_id_= #{taskId} and ahv.name_="orgPath" order by ahv.id_ desc limit 0,1
</select>
<select id="selectAssignee" resultType="java.lang.String">
SELECT ASSIGNEE_ FROM ACT_HI_TASKINST where PROC_INST_ID_ = #{procInsId} AND TASK_DEF_KEY_ = #{taskDefKey} and END_TIME_ is null ORDER BY START_TIME_ DESC
</select>
</mapper>

61
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -920,7 +920,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
long time = start_time_.getTime();
Date date = new Date(time);
flowTask.setCreateTime(date);
flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
/*flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
StringBuilder userName = new StringBuilder();
@ -931,7 +931,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
String userName_str = "";
userName_str = userName.substring(0, userName.length() - 1);
flowTask.setAssigneeName(userName_str);
}
}*/
flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
flowTask.setTaskDefKey(histTask.get("taskDefKey") == null ? "" : histTask.get("taskDefKey").toString());
@ -941,6 +942,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
//--2025-02-12添加开始
List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
if(!ASSIGNEE_List.isEmpty()){
StringBuilder userName = new StringBuilder();
for (String assignee : ASSIGNEE_List) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(assignee);
List<SysUserVo> data1 = assignee_.getData();
for (SysUserVo data : data1) {
userName.append(data.getName()).append(",");
}
}
String userName_str = "";
userName_str = userName.substring(0, userName.length() - 1);
flowTask.setAssigneeName(userName_str);
}
//===2025-02-12添加结束
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
@ -1053,7 +1070,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
Date date = new Date(time);
flowTask.setCreateTime(date);
flowTask.setProcessCreateTime(new Date(processCreateTime1));
flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
/* flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
StringBuilder userName = new StringBuilder();
@ -1064,7 +1081,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
String userName_str = "";
userName_str = userName.substring(0, userName.length() - 1);
flowTask.setAssigneeName(userName_str);
}
}*/
flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
@ -1076,6 +1093,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
//--2025-02-12添加开始
List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
if(!ASSIGNEE_List.isEmpty()){
StringBuilder userName = new StringBuilder();
for (String assignee : ASSIGNEE_List) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(assignee);
List<SysUserVo> data1 = assignee_.getData();
for (SysUserVo data : data1) {
userName.append(data.getName()).append(",");
}
}
String userName_str = "";
userName_str = userName.substring(0, userName.length() - 1);
flowTask.setAssigneeName(userName_str);
}
//===2025-02-12添加结束
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
@ -1175,7 +1208,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
Date date = new Date(time);
flowTask.setCreateTime(date);
flowTask.setProcessCreateTime(new Date(processCreateTime1));
flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
/*flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
StringBuilder userName = new StringBuilder();
@ -1186,7 +1219,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
String userName_str = "";
userName_str = userName.substring(0, userName.length() - 1);
flowTask.setAssigneeName(userName_str);
}
}*/
flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
@ -1198,6 +1231,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
//--2025-02-12添加开始
List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
if(!ASSIGNEE_List.isEmpty()){
StringBuilder userName = new StringBuilder();
for (String assignee : ASSIGNEE_List) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(assignee);
List<SysUserVo> data1 = assignee_.getData();
for (SysUserVo data : data1) {
userName.append(data.getName()).append(",");
}
}
String userName_str = "";
userName_str = userName.substring(0, userName.length() - 1);
flowTask.setAssigneeName(userName_str);
}
//===2025-02-12添加结束
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName());

Write Preview
Loading…
Cancel
Save