fix -- 格式化代码风格
This commit is contained in:
13
pom.xml
13
pom.xml
@@ -231,6 +231,13 @@
|
|||||||
<version>${tlog.version}</version>
|
<version>${tlog.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- flowable -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.flowable</groupId>
|
||||||
|
<artifactId>flowable-spring-boot-starter-process</artifactId>
|
||||||
|
<version>${flowable.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- 定时任务 -->
|
<!-- 定时任务 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>com.ruoyi</groupId>
|
||||||
@@ -273,12 +280,6 @@
|
|||||||
<version>${ruoyi-flowable-plus.version}</version>
|
<version>${ruoyi-flowable-plus.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.flowable</groupId>
|
|
||||||
<artifactId>flowable-spring-boot-starter-process</artifactId>
|
|
||||||
<version>${flowable.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- OSS对象存储模块 -->
|
<!-- OSS对象存储模块 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>com.ruoyi</groupId>
|
||||||
|
|||||||
@@ -8,9 +8,13 @@
|
|||||||
<version>3.5.0</version>
|
<version>3.5.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<packaging>jar</packaging>
|
|
||||||
<artifactId>ruoyi-flowable</artifactId>
|
<artifactId>ruoyi-flowable</artifactId>
|
||||||
|
|
||||||
|
<description>
|
||||||
|
flowable工作流
|
||||||
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|||||||
@Override
|
@Override
|
||||||
public R complete(FlowTaskVo taskVo) {
|
public R complete(FlowTaskVo taskVo) {
|
||||||
Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
|
Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
|
||||||
if (Objects.isNull(task)){
|
if (Objects.isNull(task)) {
|
||||||
return R.error("任务不存在");
|
return R.error("任务不存在");
|
||||||
}
|
}
|
||||||
if (DelegationState.PENDING.equals(task.getDelegationState())) {
|
if (DelegationState.PENDING.equals(task.getDelegationState())) {
|
||||||
@@ -360,7 +360,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|||||||
@Override
|
@Override
|
||||||
public void deleteTask(FlowTaskVo flowTaskVo) {
|
public void deleteTask(FlowTaskVo flowTaskVo) {
|
||||||
// todo 待确认删除任务是物理删除任务 还是逻辑删除,让这个任务直接通过?
|
// todo 待确认删除任务是物理删除任务 还是逻辑删除,让这个任务直接通过?
|
||||||
taskService.deleteTask(flowTaskVo.getTaskId(),flowTaskVo.getComment());
|
taskService.deleteTask(flowTaskVo.getTaskId(), flowTaskVo.getComment());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -405,7 +405,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void assignTask(FlowTaskVo flowTaskVo) {
|
public void assignTask(FlowTaskVo flowTaskVo) {
|
||||||
taskService.setAssignee(flowTaskVo.getTaskId(),flowTaskVo.getComment());
|
taskService.setAssignee(flowTaskVo.getTaskId(), flowTaskVo.getComment());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user