feat(process) taskreject set businessStatus reject

ruoyi-admin/pom.xml

@@ -97,17 +97,17 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

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" +
-                " ''-'   `'-'    `-..-'              ");
     }
 }

ruoyi-admin/src/main/resources/logback.xml

@@ -24,7 +24,7 @@
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
         </encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -47,7 +47,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -69,7 +69,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -83,7 +83,7 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.ruoyi" level="info" />
 	<!-- Spring日志级别控制  -->
@@ -92,15 +92,15 @@
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

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;
+    }
+}

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());
+
     }
 
     /**

ruoyi-ui/src/views/flowable/task/record/index.vue

@@ -137,7 +137,7 @@
                 <el-timeline-item
                   v-for="(item,index ) in flowRecordList"
                   :key="index"
-                  :icon="setIcon(item.finishTime)"
+                  :icon="setIcon(item.finishTime, item.comment)"
                   :color="setColor(item.finishTime)"
                 >
                   <p style="font-weight: 700">{{item.taskName}}</p>
@@ -160,7 +160,7 @@
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
                         <span v-if="form.submitDate !==undefined && form.submitDate !==''&& form.submitDate !==null">{{form.submitDate}}</span>
                         <span v-else>{{item.finishTime}}</span>
-                      </el-descriptions-item>
+                      </el-descriptions-item >
 <!--                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">-->
 <!--                        <template slot="label"><i class="el-icon-time"></i>耗时</template>-->
 <!--                        {{item.duration}}-->
@@ -169,6 +169,7 @@
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                         {{item.comment.comment}}
                       </el-descriptions-item>
+
                     </el-descriptions>
 
 <!--                    <p  v-if="item.comment">-->
@@ -176,6 +177,7 @@
 <!--                      <el-tag type="warning" v-if="item.comment.type === '2'">  {{item.comment.comment}}</el-tag>-->
 <!--                      <el-tag type="danger" v-if="item.comment.type === '3'">  {{item.comment.comment}}</el-tag>-->
 <!--                    </p>-->
+                    <img v-if="isRefuse(item.comment)"  src="@/assets/images/refuse.png" width="50" height="50">
                   </el-card>
                 </el-timeline-item>
               </el-timeline>
@@ -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";