admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整抄送查询，流程定义删除

Browse Source
This commit is contained in:
gssong 2024-03-24 15:12:07 +08:00
parent b017cb7b54
commit 11615685b7
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
View File

@ -179,6 +179,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
* @param processDefinitionId 流程定义id * @param processDefinitionId 流程定义id
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public boolean deleteDeployment(String deploymentId, String processDefinitionId) { public boolean deleteDeployment(String deploymentId, String processDefinitionId) {
try { try {
List<HistoricTaskInstance> taskInstanceList = QueryUtils.hisTaskInstanceQuery() List<HistoricTaskInstance> taskInstanceList = QueryUtils.hisTaskInstanceQuery()
@ -188,6 +189,8 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
} }
//删除流程定义 //删除流程定义
repositoryService.deleteDeployment(deploymentId); repositoryService.deleteDeployment(deploymentId);
//删除表单配置
iWfFormDefinitionService.getByDefId(processDefinitionId);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
View File

@ -389,6 +389,10 @@ public class ActTaskServiceImpl implements IActTaskService {
for (TaskVo task : taskList) { for (TaskVo task : taskList) {
task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus())); task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
} }
if (CollUtil.isNotEmpty(taskList)) {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return new TableDataInfo<>(taskList, page.getTotal()); return new TableDataInfo<>(taskList, page.getTotal());
} }