diff --git a/.gitignore b/.gitignore
index bb34a739..073a0423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ gen
 hs_err_pid*
 mbg.xml
 resources/mbg.xml
+resources/application.yml
diff --git a/pom.xml b/pom.xml
index 6cdeb874..6a98bbc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 <!--        <module>ht</module>-->
         <module>game</module>
         <module>mt</module>
-<!--        <module>wisdomcar</module>-->
+        <module>wisdomcar</module>
         <module>beneficiation</module>
 <!--        <module>form</module>-->
 <!--        <module>signin</module>-->
diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
index acd62ac0..44e5c8c2 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@@ -85,6 +85,7 @@ public class TaskVo {
             }
             return null;
         }
+
     }
     @ApiModel
     @Data
@@ -137,6 +138,8 @@ public class TaskVo {
         private BigDecimal money;
         @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成")
         private int process;
+        @ApiModelProperty("任务进行状态：0-未开始，1-进行中，2-已结束")
+        private int taskProgress;
         @ApiModelProperty("子项目id")
         private Long subProjectId;
         @ApiModelProperty("子项目名字")
@@ -178,6 +181,30 @@ public class TaskVo {
         @ApiModelProperty("任务创建人(userId)")
         private String buildUser;
 
+        public int getTaskProgress() {
+            long now = System.currentTimeMillis();
+            if(delay == 2){
+                if(realBeginTime != null && realBeginTime != 0){
+                    if(realEndTime == null || realEndTime == 0){
+                        return 1;
+                    }
+                    return 2;
+                }
+            }
+            if(delay == 0){
+                if(beginTime != null && endTime != null){
+                    if(beginTime > now){
+                        return 0;
+                    }
+                    if(endTime < now){
+                        return 2;
+                    }
+                    return 1;
+                }
+            }
+            return taskProgress;
+        }
+
         public Long getDuration(){
             if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) {
                 return endTime - beginTime;
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b5408a3a..ebc544af 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common
 
diff --git a/util/src/test/java/com/ccsens/util/Base64Test.java b/util/src/test/java/com/ccsens/util/Base64Test.java
index 1a3ad02a..a987ed96 100644
--- a/util/src/test/java/com/ccsens/util/Base64Test.java
+++ b/util/src/test/java/com/ccsens/util/Base64Test.java
@@ -2,11 +2,9 @@ package com.ccsens.util;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.ZipUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
-import org.springframework.util.ResourceUtils;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;