From f579a5f33b7e4e2eb1f62d3a9b3b565973a76942 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 3 Sep 2020 14:15:01 +0800
Subject: [PATCH] =?UTF-8?q?20200903=5F=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/mt/bean/po/CompetePlayer.java  | 12 ++--
 .../mt/bean/po/CompetePlayerExample.java      | 58 ++++++++-----------
 .../com/ccsens/mt/bean/po/CompeteProject.java | 12 ++--
 .../mt/bean/po/CompeteProjectExample.java     | 48 +++++++--------
 .../com/ccsens/mt/bean/po/CompeteTeam.java    | 12 ++--
 .../ccsens/mt/bean/po/CompeteTeamExample.java | 48 +++++++--------
 .../com/ccsens/mt/service/CompeteService.java | 26 +++++++--
 .../java/com/ccsens/mt/util/Constant.java     |  2 +-
 .../mapper_raw/CompetePlayerMapper.xml        | 28 ++++-----
 .../mapper_raw/CompeteProjectMapper.xml       | 28 ++++-----
 .../mapper_raw/CompeteTeamMapper.xml          | 28 ++++-----
 11 files changed, 154 insertions(+), 148 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java
index 24b27dc6..a35b7935 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java
@@ -24,7 +24,7 @@ public class CompetePlayer implements Serializable {
 
     private Long competeGroupId;
 
-    private String companyName;
+    private Long companyId;
 
     private Byte authorization;
 
@@ -116,12 +116,12 @@ public class CompetePlayer implements Serializable {
         this.competeGroupId = competeGroupId;
     }
 
-    public String getCompanyName() {
-        return companyName;
+    public Long getCompanyId() {
+        return companyId;
     }
 
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName == null ? null : companyName.trim();
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
     }
 
     public Byte getAuthorization() {
@@ -172,7 +172,7 @@ public class CompetePlayer implements Serializable {
         sb.append(", idCardBack=").append(idCardBack);
         sb.append(", proveImg=").append(proveImg);
         sb.append(", competeGroupId=").append(competeGroupId);
-        sb.append(", companyName=").append(companyName);
+        sb.append(", companyId=").append(companyId);
         sb.append(", authorization=").append(authorization);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java
index 4ea07bd4..96552c90 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java
@@ -765,73 +765,63 @@ public class CompetePlayerExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameIsNull() {
-            addCriterion("company_name is null");
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameIsNotNull() {
-            addCriterion("company_name is not null");
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameEqualTo(String value) {
-            addCriterion("company_name =", value, "companyName");
+        public Criteria andCompanyIdEqualTo(Long value) {
+            addCriterion("company_id =", value, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotEqualTo(String value) {
-            addCriterion("company_name <>", value, "companyName");
+        public Criteria andCompanyIdNotEqualTo(Long value) {
+            addCriterion("company_id <>", value, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameGreaterThan(String value) {
-            addCriterion("company_name >", value, "companyName");
+        public Criteria andCompanyIdGreaterThan(Long value) {
+            addCriterion("company_id >", value, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
-            addCriterion("company_name >=", value, "companyName");
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("company_id >=", value, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameLessThan(String value) {
-            addCriterion("company_name <", value, "companyName");
+        public Criteria andCompanyIdLessThan(Long value) {
+            addCriterion("company_id <", value, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
-            addCriterion("company_name <=", value, "companyName");
+        public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
+            addCriterion("company_id <=", value, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameLike(String value) {
-            addCriterion("company_name like", value, "companyName");
+        public Criteria andCompanyIdIn(List<Long> values) {
+            addCriterion("company_id in", values, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotLike(String value) {
-            addCriterion("company_name not like", value, "companyName");
+        public Criteria andCompanyIdNotIn(List<Long> values) {
+            addCriterion("company_id not in", values, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameIn(List<String> values) {
-            addCriterion("company_name in", values, "companyName");
+        public Criteria andCompanyIdBetween(Long value1, Long value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotIn(List<String> values) {
-            addCriterion("company_name not in", values, "companyName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyNameBetween(String value1, String value2) {
-            addCriterion("company_name between", value1, value2, "companyName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyNameNotBetween(String value1, String value2) {
-            addCriterion("company_name not between", value1, value2, "companyName");
+        public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
             return (Criteria) this;
         }
 
diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java
index 8764db28..f1cd9578 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java
@@ -8,7 +8,7 @@ public class CompeteProject implements Serializable {
 
     private String name;
 
-    private Long parentId;
+    private Long parendId;
 
     private Byte leve;
 
@@ -48,12 +48,12 @@ public class CompeteProject implements Serializable {
         this.name = name == null ? null : name.trim();
     }
 
-    public Long getParentId() {
-        return parentId;
+    public Long getParendId() {
+        return parendId;
     }
 
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
+    public void setParendId(Long parendId) {
+        this.parendId = parendId;
     }
 
     public Byte getLeve() {
@@ -144,7 +144,7 @@ public class CompeteProject implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", name=").append(name);
-        sb.append(", parentId=").append(parentId);
+        sb.append(", parendId=").append(parendId);
         sb.append(", leve=").append(leve);
         sb.append(", team=").append(team);
         sb.append(", joinRule=").append(joinRule);
diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java
index 74e15499..0b1904a1 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java
@@ -235,63 +235,63 @@ public class CompeteProjectExample {
             return (Criteria) this;
         }
 
-        public Criteria andParentIdIsNull() {
-            addCriterion("parent_id is null");
+        public Criteria andParendIdIsNull() {
+            addCriterion("parend_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdIsNotNull() {
-            addCriterion("parent_id is not null");
+        public Criteria andParendIdIsNotNull() {
+            addCriterion("parend_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdEqualTo(Long value) {
-            addCriterion("parent_id =", value, "parentId");
+        public Criteria andParendIdEqualTo(Long value) {
+            addCriterion("parend_id =", value, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdNotEqualTo(Long value) {
-            addCriterion("parent_id <>", value, "parentId");
+        public Criteria andParendIdNotEqualTo(Long value) {
+            addCriterion("parend_id <>", value, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdGreaterThan(Long value) {
-            addCriterion("parent_id >", value, "parentId");
+        public Criteria andParendIdGreaterThan(Long value) {
+            addCriterion("parend_id >", value, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("parent_id >=", value, "parentId");
+        public Criteria andParendIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("parend_id >=", value, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdLessThan(Long value) {
-            addCriterion("parent_id <", value, "parentId");
+        public Criteria andParendIdLessThan(Long value) {
+            addCriterion("parend_id <", value, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdLessThanOrEqualTo(Long value) {
-            addCriterion("parent_id <=", value, "parentId");
+        public Criteria andParendIdLessThanOrEqualTo(Long value) {
+            addCriterion("parend_id <=", value, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdIn(List<Long> values) {
-            addCriterion("parent_id in", values, "parentId");
+        public Criteria andParendIdIn(List<Long> values) {
+            addCriterion("parend_id in", values, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdNotIn(List<Long> values) {
-            addCriterion("parent_id not in", values, "parentId");
+        public Criteria andParendIdNotIn(List<Long> values) {
+            addCriterion("parend_id not in", values, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdBetween(Long value1, Long value2) {
-            addCriterion("parent_id between", value1, value2, "parentId");
+        public Criteria andParendIdBetween(Long value1, Long value2) {
+            addCriterion("parend_id between", value1, value2, "parendId");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdNotBetween(Long value1, Long value2) {
-            addCriterion("parent_id not between", value1, value2, "parentId");
+        public Criteria andParendIdNotBetween(Long value1, Long value2) {
+            addCriterion("parend_id not between", value1, value2, "parendId");
             return (Criteria) this;
         }
 
diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java
index 0bb0aeab..60d0c226 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java
@@ -8,7 +8,7 @@ public class CompeteTeam implements Serializable {
 
     private Long creator;
 
-    private Long projectId;
+    private Long porjectId;
 
     private Long competeTimeId;
 
@@ -42,12 +42,12 @@ public class CompeteTeam implements Serializable {
         this.creator = creator;
     }
 
-    public Long getProjectId() {
-        return projectId;
+    public Long getPorjectId() {
+        return porjectId;
     }
 
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
+    public void setPorjectId(Long porjectId) {
+        this.porjectId = porjectId;
     }
 
     public Long getCompeteTimeId() {
@@ -114,7 +114,7 @@ public class CompeteTeam implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", creator=").append(creator);
-        sb.append(", projectId=").append(projectId);
+        sb.append(", porjectId=").append(porjectId);
         sb.append(", competeTimeId=").append(competeTimeId);
         sb.append(", genderGroup=").append(genderGroup);
         sb.append(", certificate=").append(certificate);
diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java
index 8e894f31..f3e8b615 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java
@@ -225,63 +225,63 @@ public class CompeteTeamExample {
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIsNull() {
-            addCriterion("project_id is null");
+        public Criteria andPorjectIdIsNull() {
+            addCriterion("porject_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIsNotNull() {
-            addCriterion("project_id is not null");
+        public Criteria andPorjectIdIsNotNull() {
+            addCriterion("porject_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdEqualTo(Long value) {
-            addCriterion("project_id =", value, "projectId");
+        public Criteria andPorjectIdEqualTo(Long value) {
+            addCriterion("porject_id =", value, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotEqualTo(Long value) {
-            addCriterion("project_id <>", value, "projectId");
+        public Criteria andPorjectIdNotEqualTo(Long value) {
+            addCriterion("porject_id <>", value, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdGreaterThan(Long value) {
-            addCriterion("project_id >", value, "projectId");
+        public Criteria andPorjectIdGreaterThan(Long value) {
+            addCriterion("porject_id >", value, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("project_id >=", value, "projectId");
+        public Criteria andPorjectIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("porject_id >=", value, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLessThan(Long value) {
-            addCriterion("project_id <", value, "projectId");
+        public Criteria andPorjectIdLessThan(Long value) {
+            addCriterion("porject_id <", value, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLessThanOrEqualTo(Long value) {
-            addCriterion("project_id <=", value, "projectId");
+        public Criteria andPorjectIdLessThanOrEqualTo(Long value) {
+            addCriterion("porject_id <=", value, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIn(List<Long> values) {
-            addCriterion("project_id in", values, "projectId");
+        public Criteria andPorjectIdIn(List<Long> values) {
+            addCriterion("porject_id in", values, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotIn(List<Long> values) {
-            addCriterion("project_id not in", values, "projectId");
+        public Criteria andPorjectIdNotIn(List<Long> values) {
+            addCriterion("porject_id not in", values, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdBetween(Long value1, Long value2) {
-            addCriterion("project_id between", value1, value2, "projectId");
+        public Criteria andPorjectIdBetween(Long value1, Long value2) {
+            addCriterion("porject_id between", value1, value2, "porjectId");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotBetween(Long value1, Long value2) {
-            addCriterion("project_id not between", value1, value2, "projectId");
+        public Criteria andPorjectIdNotBetween(Long value1, Long value2) {
+            addCriterion("porject_id not between", value1, value2, "porjectId");
             return (Criteria) this;
         }
 
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 0bd29acc..f7caeede 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -7,6 +7,8 @@ import com.ccsens.mt.bean.po.CompeteCompanyExample;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.persist.dao.CompeteTimeDao;
 import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
+import com.ccsens.mt.util.Constant;
+import com.ccsens.util.RedisUtil;
 import com.ccsens.util.bean.dto.QueryDto;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +24,8 @@ public class CompeteService implements ICompeteService{
     private CompeteTimeDao competeTimeDao;
     @Resource
     private CompeteCompanyMapper competeCompanyMapper;
+    @Resource
+    private RedisUtil redisUtil;
 
     /**
      * 查看第几届
@@ -46,7 +50,21 @@ public class CompeteService implements ICompeteService{
      */
     @Override
     public List<CompeteVo.CompeteCompany> queryCompeteCompany(QueryDto<CompeteDto.CompeteTypeAndKey> params) {
-
+//        CompeteDto.CompeteTypeAndKey competeTypeAndKey = params.getParam();
+//        String key = competeTypeAndKey.getType() + Constant.Redis.COMPETE_COMPANY;
+//        Object list = redisUtil.lGet(key,0,-1);
+//        List<CompeteCompany> competeCompanyList = (List<CompeteCompany>) list;
+//        List<CompeteVo.CompeteCompany> companyList = new ArrayList<>();
+//        System.out.println(competeCompanyList);
+//        competeCompanyList.forEach(competeCompany -> {
+//            if(competeCompany.getName().contains(competeTypeAndKey.getKey())){
+//                CompeteVo.CompeteCompany company = new CompeteVo.CompeteCompany();
+//                company.setGroupId(competeCompany.getId());
+//                company.setGroupName(competeCompany.getName());
+//                companyList.add(company);
+//            }
+//        });
+//        return companyList;
         return null;
     }
 
@@ -61,10 +79,8 @@ public class CompeteService implements ICompeteService{
         competeCompanyExample.createCriteria().andTypeEqualTo((byte) competeType.getType());
         List<CompeteCompany> competeCompanyList = competeCompanyMapper.selectByExample(competeCompanyExample);
         if(CollectionUtil.isNotEmpty(competeCompanyList)){
-            competeCompanyList.forEach(competeCompany -> {
-                //将单位信息存入redis
-//                String companyKey = Constant.
-            });
+            String key = competeType.getType() + Constant.Redis.COMPETE_COMPANY;
+            redisUtil.lSet(key,competeCompanyList,Constant.Redis.COMPETE_COMPANY_TIME);
         }
     }
 
diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java
index 66f33449..842bbd22 100644
--- a/mt/src/main/java/com/ccsens/mt/util/Constant.java
+++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java
@@ -24,7 +24,7 @@ public class Constant {
         //投票已结束
         public final static int VOTE_START = 1;
         // 远程比赛参赛单位
-        public final static String COMPETE_COMPANY = "_compete_company_";
+        public final static String COMPETE_COMPANY = "_compete_company";
         // 远程比赛参赛单位存在时间10天
         public final static long COMPETE_COMPANY_TIME = 10 * 24 * 60 * 60;
     }
diff --git a/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml b/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml
index 23ea036b..52d11ab2 100644
--- a/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml
+++ b/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml
@@ -12,7 +12,7 @@
     <result column="id_card_back" jdbcType="VARCHAR" property="idCardBack" />
     <result column="prove_img" jdbcType="VARCHAR" property="proveImg" />
     <result column="compete_group_id" jdbcType="BIGINT" property="competeGroupId" />
-    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
     <result column="authorization" jdbcType="TINYINT" property="authorization" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -78,7 +78,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, user_id, name, id_card, phone, gender, id_card_front, id_card_back, prove_img, 
-    compete_group_id, company_name, authorization, created_at, updated_at, rec_status
+    compete_group_id, company_id, authorization, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompetePlayerExample" resultMap="BaseResultMap">
     select
@@ -114,13 +114,13 @@
     insert into t_compete_player (id, user_id, name, 
       id_card, phone, gender, 
       id_card_front, id_card_back, prove_img, 
-      compete_group_id, company_name, authorization, 
+      compete_group_id, company_id, authorization, 
       created_at, updated_at, rec_status
       )
     values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{idCard,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, 
       #{idCardFront,jdbcType=VARCHAR}, #{idCardBack,jdbcType=VARCHAR}, #{proveImg,jdbcType=VARCHAR}, 
-      #{competeGroupId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{authorization,jdbcType=TINYINT}, 
+      #{competeGroupId,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, #{authorization,jdbcType=TINYINT}, 
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
       )
   </insert>
@@ -157,8 +157,8 @@
       <if test="competeGroupId != null">
         compete_group_id,
       </if>
-      <if test="companyName != null">
-        company_name,
+      <if test="companyId != null">
+        company_id,
       </if>
       <if test="authorization != null">
         authorization,
@@ -204,8 +204,8 @@
       <if test="competeGroupId != null">
         #{competeGroupId,jdbcType=BIGINT},
       </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
+      <if test="companyId != null">
+        #{companyId,jdbcType=BIGINT},
       </if>
       <if test="authorization != null">
         #{authorization,jdbcType=TINYINT},
@@ -260,8 +260,8 @@
       <if test="record.competeGroupId != null">
         compete_group_id = #{record.competeGroupId,jdbcType=BIGINT},
       </if>
-      <if test="record.companyName != null">
-        company_name = #{record.companyName,jdbcType=VARCHAR},
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=BIGINT},
       </if>
       <if test="record.authorization != null">
         authorization = #{record.authorization,jdbcType=TINYINT},
@@ -292,7 +292,7 @@
       id_card_back = #{record.idCardBack,jdbcType=VARCHAR},
       prove_img = #{record.proveImg,jdbcType=VARCHAR},
       compete_group_id = #{record.competeGroupId,jdbcType=BIGINT},
-      company_name = #{record.companyName,jdbcType=VARCHAR},
+      company_id = #{record.companyId,jdbcType=BIGINT},
       authorization = #{record.authorization,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -331,8 +331,8 @@
       <if test="competeGroupId != null">
         compete_group_id = #{competeGroupId,jdbcType=BIGINT},
       </if>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=BIGINT},
       </if>
       <if test="authorization != null">
         authorization = #{authorization,jdbcType=TINYINT},
@@ -360,7 +360,7 @@
       id_card_back = #{idCardBack,jdbcType=VARCHAR},
       prove_img = #{proveImg,jdbcType=VARCHAR},
       compete_group_id = #{competeGroupId,jdbcType=BIGINT},
-      company_name = #{companyName,jdbcType=VARCHAR},
+      company_id = #{companyId,jdbcType=BIGINT},
       authorization = #{authorization,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
diff --git a/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml b/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml
index bb8e67e8..07155793 100644
--- a/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml
+++ b/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml
@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteProject">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+    <result column="parend_id" jdbcType="BIGINT" property="parendId" />
     <result column="leve" jdbcType="TINYINT" property="leve" />
     <result column="team" jdbcType="TINYINT" property="team" />
     <result column="join_rule" jdbcType="TINYINT" property="joinRule" />
@@ -75,7 +75,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, parent_id, leve, team, join_rule, certificate, member_min, member_max, 
+    id, name, parend_id, leve, team, join_rule, certificate, member_min, member_max, 
     type, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteProjectExample" resultMap="BaseResultMap">
@@ -109,12 +109,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteProject">
-    insert into t_compete_project (id, name, parent_id, 
+    insert into t_compete_project (id, name, parend_id, 
       leve, team, join_rule, 
       certificate, member_min, member_max, 
       type, created_at, updated_at, 
       rec_status)
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, 
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{parendId,jdbcType=BIGINT}, 
       #{leve,jdbcType=TINYINT}, #{team,jdbcType=TINYINT}, #{joinRule,jdbcType=TINYINT}, 
       #{certificate,jdbcType=TINYINT}, #{memberMin,jdbcType=INTEGER}, #{memberMax,jdbcType=INTEGER}, 
       #{type,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
@@ -129,8 +129,8 @@
       <if test="name != null">
         name,
       </if>
-      <if test="parentId != null">
-        parent_id,
+      <if test="parendId != null">
+        parend_id,
       </if>
       <if test="leve != null">
         leve,
@@ -170,8 +170,8 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="parentId != null">
-        #{parentId,jdbcType=BIGINT},
+      <if test="parendId != null">
+        #{parendId,jdbcType=BIGINT},
       </if>
       <if test="leve != null">
         #{leve,jdbcType=TINYINT},
@@ -220,8 +220,8 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.parentId != null">
-        parent_id = #{record.parentId,jdbcType=BIGINT},
+      <if test="record.parendId != null">
+        parend_id = #{record.parendId,jdbcType=BIGINT},
       </if>
       <if test="record.leve != null">
         leve = #{record.leve,jdbcType=TINYINT},
@@ -262,7 +262,7 @@
     update t_compete_project
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
+      parend_id = #{record.parendId,jdbcType=BIGINT},
       leve = #{record.leve,jdbcType=TINYINT},
       team = #{record.team,jdbcType=TINYINT},
       join_rule = #{record.joinRule,jdbcType=TINYINT},
@@ -283,8 +283,8 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=BIGINT},
+      <if test="parendId != null">
+        parend_id = #{parendId,jdbcType=BIGINT},
       </if>
       <if test="leve != null">
         leve = #{leve,jdbcType=TINYINT},
@@ -322,7 +322,7 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteProject">
     update t_compete_project
     set name = #{name,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=BIGINT},
+      parend_id = #{parendId,jdbcType=BIGINT},
       leve = #{leve,jdbcType=TINYINT},
       team = #{team,jdbcType=TINYINT},
       join_rule = #{joinRule,jdbcType=TINYINT},
diff --git a/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml b/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml
index cdd11c38..d0b66882 100644
--- a/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml
+++ b/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml
@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteTeam">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="creator" jdbcType="BIGINT" property="creator" />
-    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="porject_id" jdbcType="BIGINT" property="porjectId" />
     <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
     <result column="gender_group" jdbcType="TINYINT" property="genderGroup" />
     <result column="certificate" jdbcType="TINYINT" property="certificate" />
@@ -72,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, creator, project_id, compete_time_id, gender_group, certificate, qr_code, created_at, 
+    id, creator, porject_id, compete_time_id, gender_group, certificate, qr_code, created_at, 
     updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultMap="BaseResultMap">
@@ -106,11 +106,11 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteTeam">
-    insert into t_compete_team (id, creator, project_id, 
+    insert into t_compete_team (id, creator, porject_id, 
       compete_time_id, gender_group, certificate, 
       qr_code, created_at, updated_at, 
       rec_status)
-    values (#{id,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, 
+    values (#{id,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{porjectId,jdbcType=BIGINT}, 
       #{competeTimeId,jdbcType=BIGINT}, #{genderGroup,jdbcType=TINYINT}, #{certificate,jdbcType=TINYINT}, 
       #{qrCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
       #{recStatus,jdbcType=TINYINT})
@@ -124,8 +124,8 @@
       <if test="creator != null">
         creator,
       </if>
-      <if test="projectId != null">
-        project_id,
+      <if test="porjectId != null">
+        porject_id,
       </if>
       <if test="competeTimeId != null">
         compete_time_id,
@@ -156,8 +156,8 @@
       <if test="creator != null">
         #{creator,jdbcType=BIGINT},
       </if>
-      <if test="projectId != null">
-        #{projectId,jdbcType=BIGINT},
+      <if test="porjectId != null">
+        #{porjectId,jdbcType=BIGINT},
       </if>
       <if test="competeTimeId != null">
         #{competeTimeId,jdbcType=BIGINT},
@@ -197,8 +197,8 @@
       <if test="record.creator != null">
         creator = #{record.creator,jdbcType=BIGINT},
       </if>
-      <if test="record.projectId != null">
-        project_id = #{record.projectId,jdbcType=BIGINT},
+      <if test="record.porjectId != null">
+        porject_id = #{record.porjectId,jdbcType=BIGINT},
       </if>
       <if test="record.competeTimeId != null">
         compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
@@ -230,7 +230,7 @@
     update t_compete_team
     set id = #{record.id,jdbcType=BIGINT},
       creator = #{record.creator,jdbcType=BIGINT},
-      project_id = #{record.projectId,jdbcType=BIGINT},
+      porject_id = #{record.porjectId,jdbcType=BIGINT},
       compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       gender_group = #{record.genderGroup,jdbcType=TINYINT},
       certificate = #{record.certificate,jdbcType=TINYINT},
@@ -248,8 +248,8 @@
       <if test="creator != null">
         creator = #{creator,jdbcType=BIGINT},
       </if>
-      <if test="projectId != null">
-        project_id = #{projectId,jdbcType=BIGINT},
+      <if test="porjectId != null">
+        porject_id = #{porjectId,jdbcType=BIGINT},
       </if>
       <if test="competeTimeId != null">
         compete_time_id = #{competeTimeId,jdbcType=BIGINT},
@@ -278,7 +278,7 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteTeam">
     update t_compete_team
     set creator = #{creator,jdbcType=BIGINT},
-      project_id = #{projectId,jdbcType=BIGINT},
+      porject_id = #{porjectId,jdbcType=BIGINT},
       compete_time_id = #{competeTimeId,jdbcType=BIGINT},
       gender_group = #{genderGroup,jdbcType=TINYINT},
       certificate = #{certificate,jdbcType=TINYINT},