diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteController.java
index ea37039b..2bbbc585 100644
--- a/mt/src/main/java/com/ccsens/mt/api/CompeteController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/CompeteController.java
@@ -34,6 +34,16 @@ public class CompeteController {
     @Resource
     private ICompeteService competeService;
 
+
+    @ApiOperation(value = "查看比赛列表", notes = "")
+    @RequestMapping(value = "/competeTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<CompeteVo.CompeteTime> getCompeteTimeList() {
+        log.info("查看比赛列表");
+        List<CompeteVo.CompeteTime> competeTime = competeService.getCompeteTimeList();
+        return JsonResponse.newInstance().ok(competeTime);
+    }
+
+
     @MustLogin
     @ApiOperation(value = "查看当前是第几届比赛", notes = "")
     @RequestMapping(value = "/competeTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
index ca154140..e87e6d0f 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
@@ -46,6 +46,38 @@ public class CompeteVo {
         @ApiModelProperty("进行的阶段，0报名阶段 1比赛进行阶段，2评审阶段，3结束")
         private byte competeStatus;
     }
+
+    @Data
+    @ApiModel("查找比赛列表")
+    public static class CompeteTimeList{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("名字")
+        private String name;
+        @ApiModelProperty("类型")
+        private byte type;
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+        @ApiModelProperty("报名开始时间")
+        private Long signUpStartTime;
+        @ApiModelProperty("报名结束时间")
+        private Long signUpEndTime;
+        @ApiModelProperty("进行的阶段，0未开始报名 1报名中 2报名已结束")
+        private byte competeStatus;
+
+        public byte getCompeteStatus() {
+            if(signUpStartTime > System.currentTimeMillis()){
+                return 0;
+            }else if(signUpEndTime > System.currentTimeMillis()){
+                return 2;
+            }else {
+                return 1;
+            }
+        }
+    }
+
     @Data
     @ApiModel("查找组别")
     public static class CompeteGroup {
diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java
index 5532d2b3..de248a1d 100644
--- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java
@@ -63,4 +63,10 @@ public interface CompeteTimeDao extends CompeteTimeMapper {
      * @return
      */
     List<VideoProjectVo.GetTwoProject> selectTwoProject(@Param("teamId")Long teamId);
+
+    /**
+     * 查询2021比赛列表
+     * @return
+     */
+    List<CompeteVo.CompeteTime> getCompeteTimeList();
 }
diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
index 5b6bae6c..acd044c5 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -95,8 +95,6 @@ public class CompeteService implements ICompeteService {
     private  CompeteScoreDao competeScoreDao;
     @Resource
     private  CompeteCountScoreMapper competeCountScoreMapper;
-//    @Resource
-//    private CompetePlayerMapper competePlayerMapper;
     @Resource
     private CompeteJudgmentMapper competeJudgmentMapper;
     @Resource
@@ -349,6 +347,11 @@ public class CompeteService implements ICompeteService {
         return competeTimeDao.getCompeteTimeByType(competeType.getType(), System.currentTimeMillis());
     }
 
+    @Override
+    public List<CompeteVo.CompeteTime> getCompeteTimeList() {
+        return competeTimeDao.getCompeteTimeList();
+    }
+
     /**
      * 查看组别
      */
diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
index 1051e704..59da2e29 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
@@ -228,6 +228,12 @@ public interface ICompeteService {
      * @return
      */
     CompeteVo.OneScore getResult(ScoreDto.OneScore param);
+
+    /**
+     * 查看比赛列表
+     * @return
+     */
+    List<CompeteVo.CompeteTime> getCompeteTimeList();
 }
 
 
diff --git a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml
index 8c902a7f..ccad2776 100644
--- a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml
@@ -37,7 +37,22 @@
         and
         end_time &gt; #{time}
     </select>
-
+    <select id="getCompeteTimeList" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTime">
+         SELECT
+        id,
+        `name`,
+        type,
+        start_time as startTime,
+        end_time as endTime,
+        sign_up_start_time as signUpStartTime,
+        sign_up_end_time as signUpEndTime
+        FROM
+        `t_compete_time`
+        WHERE
+        rec_status = 0
+        and
+        FROM_UNIXTIME( sign_up_start_time / 1000, '%Y' ) = 2021
+    </select>
     <select id="queryCompeteGroupByType" parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteGroup">
         SELECT
             id as groupId,
@@ -143,4 +158,5 @@
         and t.rec_status = 0
         and p.rec_status = 0
     </select>
+
 </mapper>
\ No newline at end of file
diff --git a/util/src/test/java/com/ccsens/util/KeyTest.java b/util/src/test/java/com/ccsens/util/KeyTest.java
index bb2dc09e..d67e29ad 100644
--- a/util/src/test/java/com/ccsens/util/KeyTest.java
+++ b/util/src/test/java/com/ccsens/util/KeyTest.java
@@ -24,23 +24,22 @@ public class KeyTest {
     @Test
     public void test3(){
 //        String key = "a6RlI/GctLgENUvF6DOY7w==";
-        String key = "g9RlI/GctLgDFJvF6DOY7w==";
-        String string = "sdfe@#$QW";
-        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
-        String encryptHex = aes.encryptHex(string);
-        Console.log("{}",encryptHex);
+//        String key = "g9RlI/GctLgDFJvF6DOY7w==";
+//        String string = "sdfe@#$QW";
+//        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
+//        String encryptHex = aes.encryptHex(string);
+//        Console.log("{}",encryptHex);
     }
 
     /**解密*/
     @Test
     public void test4(){
-        String key = "g9RlI/GctLgDFJvF6DOY7w==";
-//        String key = System.getenv("CCSENS_GAME");
-        String encryptString = "6ba13d9930a6ad888a3704376c920a75";
-        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
-
-        //解密为字符串
-        String decryptStr = aes.decryptStr(encryptString, CharsetUtil.CHARSET_UTF_8);
-        Console.log("{}",decryptStr);
+//        String key = "g9RlI/GctLgDFJvF6DOY7w==";
+//        String encryptString = "6ba13d9930a6ad888a3704376c920a75";
+//        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
+//
+//        //解密为字符串
+//        String decryptStr = aes.decryptStr(encryptString, CharsetUtil.CHARSET_UTF_8);
+//        Console.log("{}",decryptStr);
     }
 }