diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 9049e07..b8a8a07 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -97,17 +97,17 @@
-
- org.apache.maven.plugins
- maven-war-plugin
- 3.1.0
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.1.0
false
${project.artifactId}
-
-
+
+
${project.artifactId}
-
\ No newline at end of file
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 32eb6f1..aaa7b50 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* 启动程序
- *
+ *
* @author ruoyi
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@@ -16,15 +16,5 @@ public class RuoYiApplication
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
- System.out.println("(♥◠‿◠)ノ゙ 若依启动成功 ლ(´ڡ`ლ)゙ \n" +
- " .-------. ____ __ \n" +
- " | _ _ \\ \\ \\ / / \n" +
- " | ( ' ) | \\ _. / ' \n" +
- " |(_ o _) / _( )_ .' \n" +
- " | (_,_).' __ ___(_ o _)' \n" +
- " | |\\ \\ | || |(_,_)' \n" +
- " | | \\ `' /| `-' / \n" +
- " | | \\ / \\ / \n" +
- " ''-' `'-' `-..-' ");
}
}
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index f6f01c7..5184d9b 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -24,7 +24,7 @@
${CONSOLE_LOG_PATTERN}
-
+
${log.path}/sys-info.log
@@ -47,7 +47,7 @@
DENY
-
+
${log.path}/sys-error.log
@@ -69,7 +69,7 @@
DENY
-
+
${log.path}/sys-user.log
@@ -83,7 +83,7 @@
${log.pattern}
-
+
@@ -92,15 +92,15 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FlowStatus.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FlowStatus.java
new file mode 100644
index 0000000..43179f3
--- /dev/null
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FlowStatus.java
@@ -0,0 +1,43 @@
+package com.ruoyi.flowable.common.enums;
+
+/**
+ * 流程状态类型
+ *
+ * @author Xuan xuan
+ * @date 2021/4/19
+ */
+public enum FlowStatus {
+
+ /**
+ * 说明
+ */
+ REBACK("reback", "退回意见"),
+ REJECT("reject", "驳回意见"),
+ DELEGATE("delegate", "委派意见"),
+ ASSIGN("assign", "转办意见"),
+ STOP("stop", "终止流程");
+
+ /**
+ * 类型
+ */
+ private final String value;
+
+ /**
+ * 说明
+ */
+ private final String remark;
+
+ FlowStatus(String value, String remark) {
+ this.value = value;
+ this.remark = remark;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+
+ public String getRemark() {
+ return remark;
+ }
+}
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index ff7b30d..546daae 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -11,6 +11,7 @@ import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.flowable.common.constant.ProcessConstants;
import com.ruoyi.flowable.common.enums.FlowComment;
+import com.ruoyi.flowable.common.enums.FlowStatus;
import com.ruoyi.flowable.domain.dto.FlowCommentDto;
import com.ruoyi.flowable.domain.dto.FlowNextDto;
import com.ruoyi.flowable.domain.dto.FlowTaskDto;
@@ -224,6 +225,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
throw new CustomException("无法取消或开始活动");
}
+ runtimeService.updateBusinessStatus(flowTaskVo.getInstanceId(), FlowStatus.REJECT.getValue());
+
}
/**
diff --git a/ruoyi-ui/src/assets/images/refuse.png b/ruoyi-ui/src/assets/images/refuse.png
new file mode 100644
index 0000000..6aeb87c
Binary files /dev/null and b/ruoyi-ui/src/assets/images/refuse.png differ
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index 734b00a..cf3ddee 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -137,7 +137,7 @@
{{item.taskName}}
@@ -160,7 +160,7 @@
处理时间
{{form.submitDate}}
{{item.finishTime}}
-
+
@@ -169,6 +169,7 @@
处理意见
{{item.comment.comment}}
+
@@ -176,6 +177,7 @@
+
@@ -440,8 +442,16 @@ export default {
this.taskList = res.data
})
},
- setIcon(val) {
- if (val) {
+ isRefuse(comment) {
+ return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
+ },
+ setIcon(finishTime,comment) {
+ console.log('setIcon::',comment)
+ // 驳回状态
+ if (this.isRefuse(comment)) {
+ return "el-icon-close";
+
+ } else if (finishTime) {
return "el-icon-check";
} else {
return "el-icon-time";