11-12-2

mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java

@@ -24,7 +24,7 @@ import javax.annotation.Resource;
 @Slf4j
 @Api(tags = "线上体育竞技比赛", description = "")
 @RestController
-@RequestMapping("/compete")
+@RequestMapping("/compete/score")
 public class CompeteScoreController {
     @Resource
     private ICompeteService competeService;
@@ -38,14 +38,7 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok(playerList);
     }
 
-//    @MustLogin
-//    @ApiOperation(value = "查看单个选手的信息和分数", notes = "")
-//    @RequestMapping(value = "/get/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-//    public JsonResponse<CompeteVo.QueryPlayerList> getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteProjectId> params) {
-//        log.info("查询比赛项目上的参赛选手列表：{}",params);
-//        CompeteVo.QueryPlayerList playerList = competeService.queryPlayerList(params);
-//        return JsonResponse.newInstance().ok(playerList);
-//    }
+
 
 
 }

mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java

@@ -0,0 +1,13 @@
+package com.ccsens.mt.api;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "日程", description = "")
+@RestController
+@RequestMapping("/task")
+@Slf4j
+public class CompeteTaskController {
+}

mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java

@@ -0,0 +1,30 @@
+package com.ccsens.mt.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.mt.bean.dto.CompeteDto;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "视频", description = "")
+@RestController
+@RequestMapping("/vedio")
+@Slf4j
+public class CompeteVedioController {
+
+    @MustLogin
+    @ApiOperation(value = "添加用户观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，")
+    @RequestMapping(value = "/userSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse syncCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteType> params) {
+        log.info("添加用户观看开幕式视频记录（签到用）",params);
+        return JsonResponse.newInstance().ok();
+    }
+}

mt/src/main/java/com/ccsens/mt/api/ExcelController.java

@@ -81,6 +81,13 @@ public class ExcelController {
     }
 
     @MustLogin
+    @ApiOperation(value = "比赛出场顺序", notes = "")
+    @RequestMapping(value = "/competitionOrder", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<String> competitionOrder(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) throws IOException {
+        log.info("导出比赛出场顺序：{}",params);
+        String path = excelService.iCompetitionOrderService(params);
+        return JsonResponse.newInstance().ok(path);
+    }
     @ApiOperation(value = "日程安排中间表（查询）", notes = "")
     @RequestMapping(value = "/dailyScheduleProcess", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.DailyScheduleProcess> dailyScheduleProcess(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
@@ -101,7 +108,7 @@ public class ExcelController {
     @MustLogin
     @ApiOperation(value = "xxx大赛报名表（查询）", notes = "")
     @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
+    public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.EnterInfo> params) {
         log.info("日程安排更新：{}",params);
         List<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
         return JsonResponse.newInstance().ok(competeJoinList);
@@ -115,6 +122,4 @@ public class ExcelController {
         TableVo.SchedulePlan schedulePlanDetailAllInList = excelService.schedulePlanning(params.getParam());
         return JsonResponse.newInstance().ok(schedulePlanDetailAllInList);
     }
-
-
 }

mt/src/main/java/com/ccsens/mt/api/SigninController.java

@@ -112,4 +112,8 @@ public class SigninController {
 
         return JsonResponse.newInstance().ok(getSignInfoVoList);
     }
+
+
+
+
 }

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -313,14 +313,14 @@ public class CompeteDto {
         @NotNull
         @ApiModelProperty("第几届信息的id")
         private Long competeTimeId;
-        @ApiModelProperty("项目名")
-        private String projectName;
-        @ApiModelProperty("组别")
-        private String groupName;
-        @ApiModelProperty("团队名")
-        private String companyName;
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("组别id")
+        private Long groupId;
+        @ApiModelProperty("团队id")
+        private Long companyId;
         @ApiModelProperty("姓名")
-        private String name;
+        private Long name;
         @ApiModelProperty("身份证号")
         private Long idCard;
     }

mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@@ -124,7 +124,7 @@ public class ProvinceCompeteDto {
         @ApiModelProperty("姓名")
         private String name; //姓名
         @ApiModelProperty("性别")
-        private String gender; //性别
+        private int gender; //性别
         @ApiModelProperty("联系方式")
         private String phone; //联系方式
         @ApiModelProperty("身份证号")

mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java

@@ -39,4 +39,10 @@ public class VideoDto {
         @ApiModelProperty("视频文件浏览路径")
         private String videoFileUrl;
     }
+    @Data
+    @ApiModel("添加用户观看开幕式视频记录（签到用）")
+    public static class Vdeo{
+        @ApiModelProperty("视频文件id")
+        private Long companyId;
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java

@@ -0,0 +1,172 @@
+package com.ccsens.mt.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CompeteCountScore implements Serializable {
+    private Long id;
+
+    private Long competeTimeId;
+
+    private Long projectId;
+
+    private Long siteOrderId;
+
+    private Long chiefJudgmentScore;
+
+    private Integer judgmentAScore;
+
+    private Integer judgmentBScore2;
+
+    private Integer shouldTimes;
+
+    private Integer deductTimes;
+
+    private String deductCause;
+
+    private Integer finalScore;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCompeteTimeId() {
+        return competeTimeId;
+    }
+
+    public void setCompeteTimeId(Long competeTimeId) {
+        this.competeTimeId = competeTimeId;
+    }
+
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public Long getSiteOrderId() {
+        return siteOrderId;
+    }
+
+    public void setSiteOrderId(Long siteOrderId) {
+        this.siteOrderId = siteOrderId;
+    }
+
+    public Long getChiefJudgmentScore() {
+        return chiefJudgmentScore;
+    }
+
+    public void setChiefJudgmentScore(Long chiefJudgmentScore) {
+        this.chiefJudgmentScore = chiefJudgmentScore;
+    }
+
+    public Integer getJudgmentAScore() {
+        return judgmentAScore;
+    }
+
+    public void setJudgmentAScore(Integer judgmentAScore) {
+        this.judgmentAScore = judgmentAScore;
+    }
+
+    public Integer getJudgmentBScore2() {
+        return judgmentBScore2;
+    }
+
+    public void setJudgmentBScore2(Integer judgmentBScore2) {
+        this.judgmentBScore2 = judgmentBScore2;
+    }
+
+    public Integer getShouldTimes() {
+        return shouldTimes;
+    }
+
+    public void setShouldTimes(Integer shouldTimes) {
+        this.shouldTimes = shouldTimes;
+    }
+
+    public Integer getDeductTimes() {
+        return deductTimes;
+    }
+
+    public void setDeductTimes(Integer deductTimes) {
+        this.deductTimes = deductTimes;
+    }
+
+    public String getDeductCause() {
+        return deductCause;
+    }
+
+    public void setDeductCause(String deductCause) {
+        this.deductCause = deductCause == null ? null : deductCause.trim();
+    }
+
+    public Integer getFinalScore() {
+        return finalScore;
+    }
+
+    public void setFinalScore(Integer finalScore) {
+        this.finalScore = finalScore;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", competeTimeId=").append(competeTimeId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", siteOrderId=").append(siteOrderId);
+        sb.append(", chiefJudgmentScore=").append(chiefJudgmentScore);
+        sb.append(", judgmentAScore=").append(judgmentAScore);
+        sb.append(", judgmentBScore2=").append(judgmentBScore2);
+        sb.append(", shouldTimes=").append(shouldTimes);
+        sb.append(", deductTimes=").append(deductTimes);
+        sb.append(", deductCause=").append(deductCause);
+        sb.append(", finalScore=").append(finalScore);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLook.java

@@ -0,0 +1,95 @@
+package com.ccsens.mt.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CompetePlayerLook implements Serializable {
+    private Long id;
+
+    private Long companyId;
+
+    private Byte lookStatus;
+
+    private Long lookTime;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Byte getLookStatus() {
+        return lookStatus;
+    }
+
+    public void setLookStatus(Byte lookStatus) {
+        this.lookStatus = lookStatus;
+    }
+
+    public Long getLookTime() {
+        return lookTime;
+    }
+
+    public void setLookTime(Long lookTime) {
+        this.lookTime = lookTime;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", lookStatus=").append(lookStatus);
+        sb.append(", lookTime=").append(lookTime);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLookExample.java

@@ -0,0 +1,621 @@
+package com.ccsens.mt.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CompetePlayerLookExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CompetePlayerLookExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Long value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Long value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Long value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Long value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Long> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Long> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Long value1, Long value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusIsNull() {
+            addCriterion("look_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusIsNotNull() {
+            addCriterion("look_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusEqualTo(Byte value) {
+            addCriterion("look_status =", value, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusNotEqualTo(Byte value) {
+            addCriterion("look_status <>", value, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusGreaterThan(Byte value) {
+            addCriterion("look_status >", value, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("look_status >=", value, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusLessThan(Byte value) {
+            addCriterion("look_status <", value, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("look_status <=", value, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusIn(List<Byte> values) {
+            addCriterion("look_status in", values, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusNotIn(List<Byte> values) {
+            addCriterion("look_status not in", values, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusBetween(Byte value1, Byte value2) {
+            addCriterion("look_status between", value1, value2, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("look_status not between", value1, value2, "lookStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeIsNull() {
+            addCriterion("look_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeIsNotNull() {
+            addCriterion("look_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeEqualTo(Long value) {
+            addCriterion("look_time =", value, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeNotEqualTo(Long value) {
+            addCriterion("look_time <>", value, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeGreaterThan(Long value) {
+            addCriterion("look_time >", value, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("look_time >=", value, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeLessThan(Long value) {
+            addCriterion("look_time <", value, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeLessThanOrEqualTo(Long value) {
+            addCriterion("look_time <=", value, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeIn(List<Long> values) {
+            addCriterion("look_time in", values, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeNotIn(List<Long> values) {
+            addCriterion("look_time not in", values, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeBetween(Long value1, Long value2) {
+            addCriterion("look_time between", value1, value2, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLookTimeNotBetween(Long value1, Long value2) {
+            addCriterion("look_time not between", value1, value2, "lookTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java

@@ -0,0 +1,95 @@
+package com.ccsens.mt.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CompeteStartOrder implements Serializable {
+    private Long id;
+
+    private Long playerId;
+
+    private Byte competeOrder;
+
+    private Byte site;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPlayerId() {
+        return playerId;
+    }
+
+    public void setPlayerId(Long playerId) {
+        this.playerId = playerId;
+    }
+
+    public Byte getCompeteOrder() {
+        return competeOrder;
+    }
+
+    public void setCompeteOrder(Byte competeOrder) {
+        this.competeOrder = competeOrder;
+    }
+
+    public Byte getSite() {
+        return site;
+    }
+
+    public void setSite(Byte site) {
+        this.site = site;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", playerId=").append(playerId);
+        sb.append(", competeOrder=").append(competeOrder);
+        sb.append(", site=").append(site);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java

@@ -0,0 +1,621 @@
+package com.ccsens.mt.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CompeteStartOrderExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CompeteStartOrderExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdIsNull() {
+            addCriterion("player_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdIsNotNull() {
+            addCriterion("player_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdEqualTo(Long value) {
+            addCriterion("player_id =", value, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdNotEqualTo(Long value) {
+            addCriterion("player_id <>", value, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdGreaterThan(Long value) {
+            addCriterion("player_id >", value, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("player_id >=", value, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdLessThan(Long value) {
+            addCriterion("player_id <", value, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdLessThanOrEqualTo(Long value) {
+            addCriterion("player_id <=", value, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdIn(List<Long> values) {
+            addCriterion("player_id in", values, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdNotIn(List<Long> values) {
+            addCriterion("player_id not in", values, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdBetween(Long value1, Long value2) {
+            addCriterion("player_id between", value1, value2, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlayerIdNotBetween(Long value1, Long value2) {
+            addCriterion("player_id not between", value1, value2, "playerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderIsNull() {
+            addCriterion("compete_order is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderIsNotNull() {
+            addCriterion("compete_order is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderEqualTo(Byte value) {
+            addCriterion("compete_order =", value, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderNotEqualTo(Byte value) {
+            addCriterion("compete_order <>", value, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderGreaterThan(Byte value) {
+            addCriterion("compete_order >", value, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderGreaterThanOrEqualTo(Byte value) {
+            addCriterion("compete_order >=", value, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderLessThan(Byte value) {
+            addCriterion("compete_order <", value, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderLessThanOrEqualTo(Byte value) {
+            addCriterion("compete_order <=", value, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderIn(List<Byte> values) {
+            addCriterion("compete_order in", values, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderNotIn(List<Byte> values) {
+            addCriterion("compete_order not in", values, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderBetween(Byte value1, Byte value2) {
+            addCriterion("compete_order between", value1, value2, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteOrderNotBetween(Byte value1, Byte value2) {
+            addCriterion("compete_order not between", value1, value2, "competeOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIsNull() {
+            addCriterion("site is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIsNotNull() {
+            addCriterion("site is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteEqualTo(Byte value) {
+            addCriterion("site =", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotEqualTo(Byte value) {
+            addCriterion("site <>", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteGreaterThan(Byte value) {
+            addCriterion("site >", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteGreaterThanOrEqualTo(Byte value) {
+            addCriterion("site >=", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLessThan(Byte value) {
+            addCriterion("site <", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLessThanOrEqualTo(Byte value) {
+            addCriterion("site <=", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIn(List<Byte> values) {
+            addCriterion("site in", values, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotIn(List<Byte> values) {
+            addCriterion("site not in", values, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteBetween(Byte value1, Byte value2) {
+            addCriterion("site between", value1, value2, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotBetween(Byte value1, Byte value2) {
+            addCriterion("site not between", value1, value2, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideo.java

@@ -8,19 +8,17 @@ public class CompeteVideo implements Serializable {
 
     private Long competeTimeId;
 
-    private String competeCode;
-
-    private Byte team;
+    private Long projectId;
 
     private Long playerId;
 
-    private Long fileId;
+    private Long userId;
 
     private String videoUrl;
 
-    private Long time;
+    private Long uploadTime;
 
-    private Long uploadUserId;
+    private Byte uploadStatus;
 
     private Date createdAt;
 
@@ -46,20 +44,12 @@ public class CompeteVideo implements Serializable {
         this.competeTimeId = competeTimeId;
     }
 
-    public String getCompeteCode() {
-        return competeCode;
-    }
-
-    public void setCompeteCode(String competeCode) {
-        this.competeCode = competeCode == null ? null : competeCode.trim();
-    }
-
-    public Byte getTeam() {
-        return team;
+    public Long getProjectId() {
+        return projectId;
     }
 
-    public void setTeam(Byte team) {
-        this.team = team;
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
     }
 
     public Long getPlayerId() {
@@ -70,12 +60,12 @@ public class CompeteVideo implements Serializable {
         this.playerId = playerId;
     }
 
-    public Long getFileId() {
-        return fileId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setFileId(Long fileId) {
-        this.fileId = fileId;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
     public String getVideoUrl() {
@@ -86,20 +76,20 @@ public class CompeteVideo implements Serializable {
         this.videoUrl = videoUrl == null ? null : videoUrl.trim();
     }
 
-    public Long getTime() {
-        return time;
+    public Long getUploadTime() {
+        return uploadTime;
     }
 
-    public void setTime(Long time) {
-        this.time = time;
+    public void setUploadTime(Long uploadTime) {
+        this.uploadTime = uploadTime;
     }
 
-    public Long getUploadUserId() {
-        return uploadUserId;
+    public Byte getUploadStatus() {
+        return uploadStatus;
     }
 
-    public void setUploadUserId(Long uploadUserId) {
-        this.uploadUserId = uploadUserId;
+    public void setUploadStatus(Byte uploadStatus) {
+        this.uploadStatus = uploadStatus;
     }
 
     public Date getCreatedAt() {
@@ -134,13 +124,12 @@ public class CompeteVideo implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", competeTimeId=").append(competeTimeId);
-        sb.append(", competeCode=").append(competeCode);
-        sb.append(", team=").append(team);
+        sb.append(", projectId=").append(projectId);
         sb.append(", playerId=").append(playerId);
-        sb.append(", fileId=").append(fileId);
+        sb.append(", userId=").append(userId);
         sb.append(", videoUrl=").append(videoUrl);
-        sb.append(", time=").append(time);
-        sb.append(", uploadUserId=").append(uploadUserId);
+        sb.append(", uploadTime=").append(uploadTime);
+        sb.append(", uploadStatus=").append(uploadStatus);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideoExample.java

@@ -225,133 +225,63 @@ public class CompeteVideoExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeIsNull() {
-            addCriterion("compete_code is null");
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeIsNotNull() {
-            addCriterion("compete_code is not null");
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeEqualTo(String value) {
-            addCriterion("compete_code =", value, "competeCode");
+        public Criteria andProjectIdEqualTo(Long value) {
+            addCriterion("project_id =", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeNotEqualTo(String value) {
-            addCriterion("compete_code <>", value, "competeCode");
+        public Criteria andProjectIdNotEqualTo(Long value) {
+            addCriterion("project_id <>", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeGreaterThan(String value) {
-            addCriterion("compete_code >", value, "competeCode");
+        public Criteria andProjectIdGreaterThan(Long value) {
+            addCriterion("project_id >", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("compete_code >=", value, "competeCode");
+        public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("project_id >=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeLessThan(String value) {
-            addCriterion("compete_code <", value, "competeCode");
+        public Criteria andProjectIdLessThan(Long value) {
+            addCriterion("project_id <", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeLessThanOrEqualTo(String value) {
-            addCriterion("compete_code <=", value, "competeCode");
+        public Criteria andProjectIdLessThanOrEqualTo(Long value) {
+            addCriterion("project_id <=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeLike(String value) {
-            addCriterion("compete_code like", value, "competeCode");
+        public Criteria andProjectIdIn(List<Long> values) {
+            addCriterion("project_id in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeNotLike(String value) {
-            addCriterion("compete_code not like", value, "competeCode");
+        public Criteria andProjectIdNotIn(List<Long> values) {
+            addCriterion("project_id not in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeIn(List<String> values) {
-            addCriterion("compete_code in", values, "competeCode");
+        public Criteria andProjectIdBetween(Long value1, Long value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andCompeteCodeNotIn(List<String> values) {
-            addCriterion("compete_code not in", values, "competeCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompeteCodeBetween(String value1, String value2) {
-            addCriterion("compete_code between", value1, value2, "competeCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompeteCodeNotBetween(String value1, String value2) {
-            addCriterion("compete_code not between", value1, value2, "competeCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamIsNull() {
-            addCriterion("team is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamIsNotNull() {
-            addCriterion("team is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamEqualTo(Byte value) {
-            addCriterion("team =", value, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamNotEqualTo(Byte value) {
-            addCriterion("team <>", value, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamGreaterThan(Byte value) {
-            addCriterion("team >", value, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamGreaterThanOrEqualTo(Byte value) {
-            addCriterion("team >=", value, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamLessThan(Byte value) {
-            addCriterion("team <", value, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamLessThanOrEqualTo(Byte value) {
-            addCriterion("team <=", value, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamIn(List<Byte> values) {
-            addCriterion("team in", values, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamNotIn(List<Byte> values) {
-            addCriterion("team not in", values, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamBetween(Byte value1, Byte value2) {
-            addCriterion("team between", value1, value2, "team");
-            return (Criteria) this;
-        }
-
-        public Criteria andTeamNotBetween(Byte value1, Byte value2) {
-            addCriterion("team not between", value1, value2, "team");
+        public Criteria andProjectIdNotBetween(Long value1, Long value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
             return (Criteria) this;
         }
 
@@ -415,63 +345,63 @@ public class CompeteVideoExample {
             return (Criteria) this;
         }
 
-        public Criteria andFileIdIsNull() {
-            addCriterion("file_id is null");
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdIsNotNull() {
-            addCriterion("file_id is not null");
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdEqualTo(Long value) {
-            addCriterion("file_id =", value, "fileId");
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotEqualTo(Long value) {
-            addCriterion("file_id <>", value, "fileId");
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdGreaterThan(Long value) {
-            addCriterion("file_id >", value, "fileId");
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("file_id >=", value, "fileId");
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdLessThan(Long value) {
-            addCriterion("file_id <", value, "fileId");
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdLessThanOrEqualTo(Long value) {
-            addCriterion("file_id <=", value, "fileId");
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdIn(List<Long> values) {
-            addCriterion("file_id in", values, "fileId");
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotIn(List<Long> values) {
-            addCriterion("file_id not in", values, "fileId");
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdBetween(Long value1, Long value2) {
-            addCriterion("file_id between", value1, value2, "fileId");
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotBetween(Long value1, Long value2) {
-            addCriterion("file_id not between", value1, value2, "fileId");
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
 
@@ -545,123 +475,123 @@ public class CompeteVideoExample {
             return (Criteria) this;
         }
 
-        public Criteria andTimeIsNull() {
-            addCriterion("time is null");
+        public Criteria andUploadTimeIsNull() {
+            addCriterion("upload_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andTimeIsNotNull() {
-            addCriterion("time is not null");
+        public Criteria andUploadTimeIsNotNull() {
+            addCriterion("upload_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTimeEqualTo(Long value) {
-            addCriterion("time =", value, "time");
+        public Criteria andUploadTimeEqualTo(Long value) {
+            addCriterion("upload_time =", value, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNotEqualTo(Long value) {
-            addCriterion("time <>", value, "time");
+        public Criteria andUploadTimeNotEqualTo(Long value) {
+            addCriterion("upload_time <>", value, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeGreaterThan(Long value) {
-            addCriterion("time >", value, "time");
+        public Criteria andUploadTimeGreaterThan(Long value) {
+            addCriterion("upload_time >", value, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("time >=", value, "time");
+        public Criteria andUploadTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("upload_time >=", value, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeLessThan(Long value) {
-            addCriterion("time <", value, "time");
+        public Criteria andUploadTimeLessThan(Long value) {
+            addCriterion("upload_time <", value, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeLessThanOrEqualTo(Long value) {
-            addCriterion("time <=", value, "time");
+        public Criteria andUploadTimeLessThanOrEqualTo(Long value) {
+            addCriterion("upload_time <=", value, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeIn(List<Long> values) {
-            addCriterion("time in", values, "time");
+        public Criteria andUploadTimeIn(List<Long> values) {
+            addCriterion("upload_time in", values, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNotIn(List<Long> values) {
-            addCriterion("time not in", values, "time");
+        public Criteria andUploadTimeNotIn(List<Long> values) {
+            addCriterion("upload_time not in", values, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeBetween(Long value1, Long value2) {
-            addCriterion("time between", value1, value2, "time");
+        public Criteria andUploadTimeBetween(Long value1, Long value2) {
+            addCriterion("upload_time between", value1, value2, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNotBetween(Long value1, Long value2) {
-            addCriterion("time not between", value1, value2, "time");
+        public Criteria andUploadTimeNotBetween(Long value1, Long value2) {
+            addCriterion("upload_time not between", value1, value2, "uploadTime");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdIsNull() {
-            addCriterion("upload_user_id is null");
+        public Criteria andUploadStatusIsNull() {
+            addCriterion("upload_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdIsNotNull() {
-            addCriterion("upload_user_id is not null");
+        public Criteria andUploadStatusIsNotNull() {
+            addCriterion("upload_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdEqualTo(Long value) {
-            addCriterion("upload_user_id =", value, "uploadUserId");
+        public Criteria andUploadStatusEqualTo(Byte value) {
+            addCriterion("upload_status =", value, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdNotEqualTo(Long value) {
-            addCriterion("upload_user_id <>", value, "uploadUserId");
+        public Criteria andUploadStatusNotEqualTo(Byte value) {
+            addCriterion("upload_status <>", value, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdGreaterThan(Long value) {
-            addCriterion("upload_user_id >", value, "uploadUserId");
+        public Criteria andUploadStatusGreaterThan(Byte value) {
+            addCriterion("upload_status >", value, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("upload_user_id >=", value, "uploadUserId");
+        public Criteria andUploadStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("upload_status >=", value, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdLessThan(Long value) {
-            addCriterion("upload_user_id <", value, "uploadUserId");
+        public Criteria andUploadStatusLessThan(Byte value) {
+            addCriterion("upload_status <", value, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdLessThanOrEqualTo(Long value) {
-            addCriterion("upload_user_id <=", value, "uploadUserId");
+        public Criteria andUploadStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("upload_status <=", value, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdIn(List<Long> values) {
-            addCriterion("upload_user_id in", values, "uploadUserId");
+        public Criteria andUploadStatusIn(List<Byte> values) {
+            addCriterion("upload_status in", values, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdNotIn(List<Long> values) {
-            addCriterion("upload_user_id not in", values, "uploadUserId");
+        public Criteria andUploadStatusNotIn(List<Byte> values) {
+            addCriterion("upload_status not in", values, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdBetween(Long value1, Long value2) {
-            addCriterion("upload_user_id between", value1, value2, "uploadUserId");
+        public Criteria andUploadStatusBetween(Byte value1, Byte value2) {
+            addCriterion("upload_status between", value1, value2, "uploadStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUploadUserIdNotBetween(Long value1, Long value2) {
-            addCriterion("upload_user_id not between", value1, value2, "uploadUserId");
+        public Criteria andUploadStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("upload_status not between", value1, value2, "uploadStatus");
             return (Criteria) this;
         }
 

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java

@@ -0,0 +1,62 @@
+package com.ccsens.mt.bean.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompeteExcelVo {
+    @Data
+    @ApiModel("顺序表")
+    public static class TeamOrderPlayer {
+        @ApiModelProperty("组别id")
+        private String groupId;
+        @ApiModelProperty("组别名")
+        private String groupName;
+        @ApiModelProperty("单位信息")
+        private List<TeamOrderPlayerList> companyNameList;
+    }
+
+
+    @Data
+    @ApiModel("顺序表")
+    public static class TeamOrderPlayerList {
+        @ApiModelProperty("团队id")
+        private Long teamId;
+        @ApiModelProperty("单位名称")
+        private String companyName;
+        @ApiModelProperty("团队选手名字")
+        private String playerNames;
+    }
+
+    @Data
+    @ApiModel("所有项目")
+    public static class AllProject{
+        @ApiModelProperty("项目id")
+        private Long id;
+        @ApiModelProperty("项目名字")
+        private String projectName;
+        @ApiModelProperty("开始时间Long")
+        private Long startTime;
+        @ApiModelProperty("开始时间Str")
+        private String startTimeStr;
+        @ApiModelProperty("结束时间Long")
+        private Long endTime;
+        @ApiModelProperty("结束时间Str")
+        private String endTimeStr;
+        @ApiModelProperty("组别大小")
+        private int size;
+        @ApiModelProperty("是否为团队项目，0不是 1是")
+        private Byte team;
+        @ApiModelProperty("项目场地数量")
+        private int siteNum;
+        @ApiModelProperty("项目信息")
+        private List<TeamOrderPlayer> projectList;
+        @ApiModelProperty("月/日 上/下午")
+        private String year;
+    }
+}

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java

@@ -3,6 +3,7 @@ package com.ccsens.mt.persist.dao;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
 import com.ccsens.mt.bean.po.CompeteCoach;
 import com.ccsens.mt.bean.po.CompeteCompany;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
@@ -141,5 +142,6 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
     int getTeamNumByPlayerIdAndGroup(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId, @Param("projectId")Long projectId,
                                      @Param("companyId")Long companyId, @Param("gender")int gender, @Param("groupRemark")int groupRemark);
 
+    List<CompeteExcelVo.AllProject> selectProjectByType(Long id);
     List<ProvinceCompeteVo.PlayerInfoByGroup> queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId);
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java

@@ -1,6 +1,8 @@
 package com.ccsens.mt.persist.dao;
 
+import com.ccsens.mt.bean.po.CompeteGroup;
 import com.ccsens.mt.bean.po.CompetePlayer;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.bean.vo.TableVo;
@@ -73,4 +75,7 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
     List<TableVo.CompeteAllCount> getTeamJoinNumByType(@Param("timeId")Long timeId);
 
     List<Integer> getTeamJoinNumByProjectId(@Param("projectId")Long projectId);
+
+    CompeteGroup selectBySexAndRemark(int gender, int groupRemark);
+    List<CompeteExcelVo.TeamOrderPlayer> selectSinglePlayerByProjectId(Long id);
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
     CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId);
     List<TableVo.SchedulePlanDetail> selectDetail ();
+    List<TableVo.CompeteJoin> selectSingle ();
+    List<TableVo.CompeteJoin> selectGroup ();
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTeamDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.mt.persist.dao;
 
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.persist.mapper.CompeteTeamMapper;
 import org.apache.ibatis.annotations.Param;
@@ -80,4 +81,6 @@ public interface CompeteTeamDao extends CompeteTeamMapper {
      * @return
      */
     List<CompeteVo.PlayerInfoByProject> getPlayerByProjectId(@Param("competeProjectId")Long competeProjectId, @Param("competeTimeId")Long competeTimeId);
+
+    List<CompeteExcelVo.TeamOrderPlayer> selectTeamMemberByProjectId(Long id);
 }

mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.mt.persist.mapper;
+
+import com.ccsens.mt.bean.po.CompeteCountScore;
+import com.ccsens.mt.bean.po.CompeteCountScoreExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CompeteCountScoreMapper {
+    long countByExample(CompeteCountScoreExample example);
+
+    int deleteByExample(CompeteCountScoreExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(CompeteCountScore record);
+
+    int insertSelective(CompeteCountScore record);
+
+    List<CompeteCountScore> selectByExample(CompeteCountScoreExample example);
+
+    CompeteCountScore selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example);
+
+    int updateByExample(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example);
+
+    int updateByPrimaryKeySelective(CompeteCountScore record);
+
+    int updateByPrimaryKey(CompeteCountScore record);
+}

mt/src/main/java/com/ccsens/mt/persist/mapper/CompetePlayerLookMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.mt.persist.mapper;
+
+import com.ccsens.mt.bean.po.CompetePlayerLook;
+import com.ccsens.mt.bean.po.CompetePlayerLookExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CompetePlayerLookMapper {
+    long countByExample(CompetePlayerLookExample example);
+
+    int deleteByExample(CompetePlayerLookExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(CompetePlayerLook record);
+
+    int insertSelective(CompetePlayerLook record);
+
+    List<CompetePlayerLook> selectByExample(CompetePlayerLookExample example);
+
+    CompetePlayerLook selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") CompetePlayerLook record, @Param("example") CompetePlayerLookExample example);
+
+    int updateByExample(@Param("record") CompetePlayerLook record, @Param("example") CompetePlayerLookExample example);
+
+    int updateByPrimaryKeySelective(CompetePlayerLook record);
+
+    int updateByPrimaryKey(CompetePlayerLook record);
+}

mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteStartOrderMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.mt.persist.mapper;
+
+import com.ccsens.mt.bean.po.CompeteStartOrder;
+import com.ccsens.mt.bean.po.CompeteStartOrderExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CompeteStartOrderMapper {
+    long countByExample(CompeteStartOrderExample example);
+
+    int deleteByExample(CompeteStartOrderExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(CompeteStartOrder record);
+
+    int insertSelective(CompeteStartOrder record);
+
+    List<CompeteStartOrder> selectByExample(CompeteStartOrderExample example);
+
+    CompeteStartOrder selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") CompeteStartOrder record, @Param("example") CompeteStartOrderExample example);
+
+    int updateByExample(@Param("record") CompeteStartOrder record, @Param("example") CompeteStartOrderExample example);
+
+    int updateByPrimaryKeySelective(CompeteStartOrder record);
+
+    int updateByPrimaryKey(CompeteStartOrder record);
+}

mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java

@@ -0,0 +1,32 @@
+package com.ccsens.mt.service;
+
+import cn.hutool.core.lang.Snowflake;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 10071
+ */
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class CompeteVedioService implements ICompeteVedioService{
+
+    @Resource
+    private Snowflake snowflake;
+
+
+    @Override
+    public void insertSignVideo(Long companyId) {
+
+    }
+
+    @Override
+    public void selectSignVideo(Long companyId) {
+
+    }
+}

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
 import com.ccsens.mt.bean.po.*;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
@@ -20,18 +21,23 @@ import com.ccsens.util.exception.BaseException;
 import com.ctc.wstx.util.DataUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.unit.DataUnit;
+
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.util.*;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -60,6 +66,8 @@ public class ExcelService implements IExcelService {
     @Resource
     private CompeteGroupMapper competeGroupMapper;
     @Resource
+    private CompeteProjectConfigMapper competeProjectConfigMapper;
+    @Resource
     private CommonFileMapper commonFileMapper;
     @Resource
     private IProvinceService provinceService;
@@ -652,6 +660,184 @@ public class ExcelService implements IExcelService {
         return path;
     }
 
+    /**
+     * 导出出场顺序表
+     * @param params
+     * @return
+     */
+    @Override
+    public String iCompetitionOrderService(QueryDto<CompeteDto.CompeteTime> params) {
+        List<CompeteExcelVo.AllProject> competeProjectList= competeCompanyDao.selectProjectByType(params.getParam().getCompeteTimeId());
+        for (int i=0;i<competeProjectList.size();i++){
+            CompeteExcelVo.AllProject competeProject=competeProjectList.get(i);
+            SimpleDateFormat start=new SimpleDateFormat("HH:mm");
+            SimpleDateFormat end=new SimpleDateFormat("HH:mm");
+            SimpleDateFormat date=new SimpleDateFormat("MM-dd a");
+            String startStr=start.format(new Date(competeProject.getStartTime()));
+            competeProject.setStartTimeStr(startStr);
+
+            String endStr=end.format(new Date(competeProject.getEndTime()));
+            competeProject.setEndTimeStr(endStr);
+            String year=date.format(new Date(competeProject.getStartTime()));
+            competeProject.setYear(year);
+            int siteNum=competeProject.getSiteNum();
+            competeProject.setSiteNum(siteNum);
+            int size;
+            if(competeProject.getTeam().equals((byte) 0)){
+                List<CompeteExcelVo.TeamOrderPlayer> singleOrderPlayerList=competePlayerDao.selectSinglePlayerByProjectId(competeProject.getId());
+                size = singleOrderPlayerList.stream().mapToInt(singleOrderPlayer -> singleOrderPlayer.getCompanyNameList().size()).sum();
+                competeProject.setProjectList(singleOrderPlayerList);
+            }else {
+                List<CompeteExcelVo.TeamOrderPlayer>  teamOrderPlayerList= competeTeamDao.selectTeamMemberByProjectId(competeProject.getId());
+                size = teamOrderPlayerList.stream().mapToInt(teamOrderPlayer -> teamOrderPlayer.getCompanyNameList().size()).sum();
+                competeProject.setProjectList(teamOrderPlayerList);
+            }
+            competeProject.setSize(size);
+        }
+        String dasia=competeTimeDao.selectByPrimaryKey(params.getParam().getCompeteTimeId()).getName();
+        //创建excle表格对象
+        List<List<PoiUtil.PoiUtilCell>> biao = new ArrayList<>();
+        List<PoiUtil.PoiUtilCell> one = new ArrayList<>();
+        PoiUtil.PoiUtilCell yuandongyuan=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 6, 1);
+        yuandongyuan.setValue(dasia+"出场顺序表");
+        one.add(yuandongyuan);
+        biao.add(one);
+
+
+        for (int j=0 ;j<competeProjectList.size();j++){
+            List<PoiUtil.PoiUtilCell> three = new ArrayList<>();
+            PoiUtil.PoiUtilCell threeDate=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 6, 1);
+            if(j==0){
+                threeDate.setValue(competeProjectList.get(j).getYear());
+                three.add(threeDate);
+                biao.add(three);
+                List<PoiUtil.PoiUtilCell> two = new ArrayList<>();
+                PoiUtil.PoiUtilCell two1=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two1.setValue("时间");
+                PoiUtil.PoiUtilCell two2=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two2.setValue("项目");
+                PoiUtil.PoiUtilCell two3=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two3.setValue("组别");
+                PoiUtil.PoiUtilCell two4=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two4.setValue("场次/场地");
+                PoiUtil.PoiUtilCell two5=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two5.setValue("参赛单位");
+                PoiUtil.PoiUtilCell two6=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two6.setValue("参赛人员");
+                two.add(two1);
+                two.add(two2);
+                two.add(two3);
+                two.add(two4);
+                two.add(two5);
+                two.add(two6);
+                biao.add(two);
+            }else{
+                if (!competeProjectList.get(j).getYear().equals(competeProjectList.get(j-1).getYear())){
+                    threeDate.setValue(competeProjectList.get(j).getYear());
+                    three.add(threeDate);
+                    biao.add(three);
+                    List<PoiUtil.PoiUtilCell> two = new ArrayList<>();
+                    PoiUtil.PoiUtilCell two1=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two1.setValue("时间");
+                    PoiUtil.PoiUtilCell two2=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two2.setValue("项目");
+                    PoiUtil.PoiUtilCell two3=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two3.setValue("组别");
+                    PoiUtil.PoiUtilCell two4=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two4.setValue("场次/场地");
+                    PoiUtil.PoiUtilCell two5=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two5.setValue("参赛单位");
+                    PoiUtil.PoiUtilCell two6=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two6.setValue("参赛人员");
+                    two.add(two1);
+                    two.add(two2);
+                    two.add(two3);
+                    two.add(two4);
+                    two.add(two5);
+                    two.add(two6);
+                    biao.add(two);
+                }
+            }
+            //m行循环 是16次  k 是组次数得循环  4 次  n是组里面得循环
+            for(int k=0,m=0,n=0;m<competeProjectList.get(j).getSize();m++){
+                //代表一行
+                List<PoiUtil.PoiUtilCell> four = new ArrayList<>();
+                if(m==0){
+                    PoiUtil.PoiUtilCell fourOne=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, competeProjectList.get(j).getSize());
+                    fourOne.setValue(competeProjectList.get(j).getStartTimeStr()+"-"+competeProjectList.get(j).getEndTimeStr());
+                    four.add(fourOne);
+                    PoiUtil.PoiUtilCell fourTwo=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, competeProjectList.get(j).getSize());
+                    fourTwo.setValue(competeProjectList.get(j).getProjectName());
+                    four.add(fourTwo);
+                }else {
+                    four.add(new PoiUtil.PoiUtilCell());
+                    four.add(new PoiUtil.PoiUtilCell());
+                }
+
+                PoiUtil.PoiUtilCell fourThree=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, competeProjectList.get(j).getProjectList().get(k).getCompanyNameList().size());
+                if(n>0){
+                    fourThree=new PoiUtil.PoiUtilCell();
+                }else {
+                    fourThree.setValue(competeProjectList.get(j).getProjectList().get(k++).getGroupName());
+                    n++;
+                }
+                if(n==competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().size()){
+                    n=0;
+                    //k++
+                }
+                four.add(fourThree);
+
+                PoiUtil.PoiUtilCell fourFour=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                int x=competeProjectList.get(j).getTeam();
+                if(x<=0){
+                    x=2;
+                }
+                if((m+1)%x==0){
+                    fourFour.setValue(""+((m+1)/x)+"--"+x);
+                }else {
+                    fourFour.setValue(""+((m+1)/x+1)+"--"+((m+1)%x));
+                }
+                four.add(fourFour);
+                PoiUtil.PoiUtilCell fourFive=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                if(n==0){
+                    log.info("j:{}, k:{}, n:{}", j,k,n);
+                    fourFive.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n).getCompanyName());
+                }else {
+                    fourFive.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n-1).getCompanyName());
+                }
+                four.add(fourFive);
+                PoiUtil.PoiUtilCell fourSix=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                if(n==0){
+                    fourSix.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n).getPlayerNames());
+                }else {
+                    fourSix.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n-1).getPlayerNames());
+                }
+                four.add(fourSix);
+                biao.add(four);
+            }
+        }
+
+        Workbook workbook = new XSSFWorkbook();
+        PoiUtil.exportWB("出场顺序",biao,workbook);
+        String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx";
+        String path = PropUtil.path + filepath;
+        String path1="C:/d/"+filepath;//本地的路径
+        File tmpFile = new File(path);
+        if (!tmpFile.getParentFile().exists()) {
+            tmpFile.getParentFile().mkdirs();
+        }
+        File file = new File(path);
+        try {
+            OutputStream outputStream = new FileOutputStream(file);
+            workbook.write(outputStream);
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return  PropUtil.domain + "file/download/know?path="+path;
+    }
+
+
 
 //    private List<TableVo.CompeteAllCount> competeAllCountList(CompeteDto.CompeteTime params){
 //        //根据大赛查类型
@@ -930,156 +1116,178 @@ public class ExcelService implements IExcelService {
 
 
     @Override
-    public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.CompeteTime params) {
+    public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
           List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
-        Long competeTimeId = params.getCompeteTimeId();
-        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
-        int type = competeTime.getType();
-        Byte level = 2;
-        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
-        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
-        //获取参赛项目集合
-        List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
-        for (CompeteProject competeProject : competeProjectList) {
-            String projectName = competeProject.getName();
-            if (competeProject.getTeam() == 0) {
-                //如果不是团队项目，查询该项目下报名人数集合
-                CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
-                competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
-                List<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
-                for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
-                    //查询每个报名人的详细信息下
-                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
-                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-                    //项目id
-                    competeJoin.setProjectId(competeProject.getId());
-                    //姓名
-                    competeJoin.setName(competePlayer.getName());
-                    //身份证号
-                    competeJoin.setIdCard(competePlayer.getIdCard());
-                    //根据身份证获取选手年龄并赋值
+          //个人项目查询
+          List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle();
+          for (TableVo.CompeteJoin competeJoin : competeJoinList1){
+              //获取身份证
               String idCard = competeJoin.getIdCard();
+              //根据身份证获取选手年龄并赋值
               int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
               competeJoin.setAge(ageByIdCard);
-                    Byte gender = competePlayer.getGender();
-                    if (gender == 0) {
-                        competeJoin.setGender("女");
-                    } else {
-                        competeJoin.setGender("男");
-                    }
-                    //查询单位,并赋值
-                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
-                    if (ObjectUtil.isNotNull(competeCompany)) {
-                        competeJoin.setJoinTeam(competeCompany.getName());
-                    }
-                    //查询组别，并赋值
-                    CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
-                    if (ObjectUtil.isNotNull(competeGroup)) {
-                        competeJoin.setCompeteGroup(competePlayer.getName());
-                    }
-                    //身份证明查询，并赋值
-                    CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
-                    if (ObjectUtil.isNotNull(commonFile)) {
-                        competeJoin.setIdCardPromise(commonFile.getVisitLocation());
-                    }
-                    //一寸证件照查询赋值
-                    CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
-                    if (ObjectUtil.isNotNull(commonFile1)) {
-                        competeJoin.setPicture(commonFile1.getVisitLocation());
-                    }
-                    //学籍证明/俱乐部证明
-                    CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
-                    if (ObjectUtil.isNotNull(commonFile2)) {
-                        competeJoin.setStudentPromise(commonFile2.getVisitLocation());
-                    }
-                    //体检证明
-                    CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
-                    if (ObjectUtil.isNotNull(commonFile3)) {
-                        competeJoin.setBodyTest(commonFile3.getVisitLocation());
-                    }
-                    //人身意外伤害保险证明
-                    CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
-                    if (ObjectUtil.isNotNull(commonFile4)) {
-                        competeJoin.setBodyProtect(commonFile4.getVisitLocation());
-                    }
-                    //参赛项目名赋值
-                    competeJoin.setCompeteProject(projectName);
               competeJoinList.add(competeJoin);
           }
-
-            } else { //团队项目
-                //获取参赛队伍集合
-                CompeteTeamExample competeTeamExample = new CompeteTeamExample();
-                competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
-                List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
-                for (CompeteTeam competeTeam : competeTeamList) {
-                    //获取队伍下的成员集合
-                    CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
-                    competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
-                    List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
-                    for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
-                        //查询成员详细信息
-                        CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
-                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-                        //项目id
-                        competeJoin.setProjectId(competeProject.getId());
-                        //姓名
-                        competeJoin.setName(competePlayer.getName());
-                        //身份证号
-                        competeJoin.setIdCard(competePlayer.getIdCard());
-                        //根据身份证获取选手年龄并赋值
+          //团队项目查询
+          List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup();
+          for (TableVo.CompeteJoin competeJoin : competeJoinList2){
+              //获取身份证
               String idCard = competeJoin.getIdCard();
+              //根据身份证获取选手年龄并赋值
               int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
               competeJoin.setAge(ageByIdCard);
-                        //性别
-                        Byte gender = competePlayer.getGender();
-                        if (gender == 0) {
-                            competeJoin.setGender("女");
-                        } else {
-                            competeJoin.setGender("男");
-                        }
-                        //查询单位,并赋值
-                        CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
-                        if (ObjectUtil.isNotNull(competeCompany)) {
-                            competeJoin.setJoinTeam(competeCompany.getName());
-                        }
-                        //查询组别，并赋值
-                        CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
-                        if (ObjectUtil.isNotNull(competeGroup)) {
-                            competeJoin.setCompeteGroup(competePlayer.getName());
-                        }
-                        //身份证明查询，并赋值
-                        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
-                        if (ObjectUtil.isNotNull(commonFile)){
-                            competeJoin.setIdCardPromise(commonFile.getVisitLocation());
-                        }
-                        //一寸证件照查询赋值
-                        CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
-                        if (ObjectUtil.isNotNull(commonFile1)){
-                            competeJoin.setPicture(commonFile1.getVisitLocation());
-                        }
-                        //学籍证明/俱乐部证明
-                        CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
-                        if (ObjectUtil.isNotNull(commonFile2)){
-                            competeJoin.setStudentPromise(commonFile2.getVisitLocation());
-                        }
-                        //体检证明
-                        CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
-                        if (ObjectUtil.isNotNull(commonFile3)){
-                            competeJoin.setBodyTest(commonFile3.getVisitLocation());
-                        }
-                        //人身意外伤害保险证明
-                        CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
-                        if (ObjectUtil.isNotNull(commonFile4)){
-                            competeJoin.setBodyProtect(commonFile4.getVisitLocation());
-                        }
-                        //参赛项目名赋值
-                        competeJoin.setCompeteProject(projectName);
               competeJoinList.add(competeJoin);
           }
-                }
-            }
-        }
+//        Long competeTimeId = params.getCompeteTimeId();
+//        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
+//        int type = competeTime.getType();
+//        Byte level = 2;
+//        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
+//        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
+//        //获取参赛项目集合
+//        List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
+//        for (CompeteProject competeProject : competeProjectList) {
+//            String projectName = competeProject.getName();
+//            if (competeProject.getTeam() == 0) {
+//                //如果不是团队项目，查询该项目下报名人数集合
+//                CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
+//                competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
+//                List<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+//                for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
+//                    //查询每个报名人的详细信息下
+//                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
+//                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
+//                    //项目id
+//                    competeJoin.setProjectId(competeProject.getId());
+//                    //姓名
+//                    competeJoin.setName(competePlayer.getName());
+//                    //身份证号
+//                    competeJoin.setIdCard(competePlayer.getIdCard());
+//                    //根据身份证获取选手年龄并赋值
+//                    String idCard = competeJoin.getIdCard();
+//                    int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
+//                    competeJoin.setAge(ageByIdCard);
+//                    Byte gender = competePlayer.getGender();
+//                    if (gender == 0) {
+//                        competeJoin.setGender("女");
+//                    } else {
+//                        competeJoin.setGender("男");
+//                    }
+//                    //查询单位,并赋值
+//                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
+//                    if (ObjectUtil.isNotNull(competeCompany)) {
+//                        competeJoin.setJoinTeam(competeCompany.getName());
+//                    }
+//                    //查询组别，并赋值
+//                    CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
+//                    if (ObjectUtil.isNotNull(competeGroup)) {
+//                        competeJoin.setCompeteGroup(competePlayer.getName());
+//                    }
+//                    //身份证明查询，并赋值
+//                    CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
+//                    if (ObjectUtil.isNotNull(commonFile)) {
+//                        competeJoin.setIdCardPromise(commonFile.getVisitLocation());
+//                    }
+//                    //一寸证件照查询赋值
+//                    CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
+//                    if (ObjectUtil.isNotNull(commonFile1)) {
+//                        competeJoin.setPicture(commonFile1.getVisitLocation());
+//                    }
+//                    //学籍证明/俱乐部证明
+//                    CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
+//                    if (ObjectUtil.isNotNull(commonFile2)) {
+//                        competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+//                    }
+//                    //体检证明
+//                    CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
+//                    if (ObjectUtil.isNotNull(commonFile3)) {
+//                        competeJoin.setBodyTest(commonFile3.getVisitLocation());
+//                    }
+//                    //人身意外伤害保险证明
+//                    CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
+//                    if (ObjectUtil.isNotNull(commonFile4)) {
+//                        competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+//                    }
+//                    //参赛项目名赋值
+//                    competeJoin.setCompeteProject(projectName);
+//                    competeJoinList.add(competeJoin);
+//                }
+//
+//            } else { //团队项目
+//                //获取参赛队伍集合
+//                CompeteTeamExample competeTeamExample = new CompeteTeamExample();
+//                competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
+//                List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
+//                for (CompeteTeam competeTeam : competeTeamList) {
+//                    //获取队伍下的成员集合
+//                    CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
+//                    competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
+//                    List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+//                    for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
+//                        //查询成员详细信息
+//                        CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
+//                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
+//                        //项目id
+//                        competeJoin.setProjectId(competeProject.getId());
+//                        //姓名
+//                        competeJoin.setName(competePlayer.getName());
+//                        //身份证号
+//                        competeJoin.setIdCard(competePlayer.getIdCard());
+//                        //根据身份证获取选手年龄并赋值
+//                        String idCard = competeJoin.getIdCard();
+//                        int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
+//                        competeJoin.setAge(ageByIdCard);
+//                        //性别
+//                        Byte gender = competePlayer.getGender();
+//                        if (gender == 0) {
+//                            competeJoin.setGender("女");
+//                        } else {
+//                            competeJoin.setGender("男");
+//                        }
+//                        //查询单位,并赋值
+//                        CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
+//                        if (ObjectUtil.isNotNull(competeCompany)) {
+//                            competeJoin.setJoinTeam(competeCompany.getName());
+//                        }
+//                        //查询组别，并赋值
+//                        CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
+//                        if (ObjectUtil.isNotNull(competeGroup)) {
+//                            competeJoin.setCompeteGroup(competePlayer.getName());
+//                        }
+//                        //身份证明查询，并赋值
+//                        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
+//                        if (ObjectUtil.isNotNull(commonFile)){
+//                            competeJoin.setIdCardPromise(commonFile.getVisitLocation());
+//                        }
+//                        //一寸证件照查询赋值
+//                        CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
+//                        if (ObjectUtil.isNotNull(commonFile1)){
+//                            competeJoin.setPicture(commonFile1.getVisitLocation());
+//                        }
+//                        //学籍证明/俱乐部证明
+//                        CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
+//                        if (ObjectUtil.isNotNull(commonFile2)){
+//                            competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+//                        }
+//                        //体检证明
+//                        CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
+//                        if (ObjectUtil.isNotNull(commonFile3)){
+//                            competeJoin.setBodyTest(commonFile3.getVisitLocation());
+//                        }
+//                        //人身意外伤害保险证明
+//                        CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
+//                        if (ObjectUtil.isNotNull(commonFile4)){
+//                            competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+//                        }
+//                        //参赛项目名赋值
+//                        competeJoin.setCompeteProject(projectName);
+//                        competeJoinList.add(competeJoin);
+//                    }
+//                }
+//            }
+//        }
+//        return competeJoinList;
+
         return  competeJoinList;
     }
 

mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java

@@ -0,0 +1,16 @@
+package com.ccsens.mt.service;
+
+public interface ICompeteVedioService {
+    /**
+     *
+     * 添加用户观看开幕式视频记录（签到用）
+     * @param companyId 单位id
+     */
+    void insertSignVideo(Long companyId);
+
+    /**
+     * 查看用户观看视频记录（签到用）
+     * @param companyId
+     */
+    void selectSignVideo(Long companyId);
+}

mt/src/main/java/com/ccsens/mt/service/IExcelService.java

@@ -42,7 +42,7 @@ public interface IExcelService {
      * @param  params 大赛id
      * @return 返回失败的信息
      */
-    List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.CompeteTime params);
+    List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
 
 
     /**
@@ -60,6 +60,9 @@ public interface IExcelService {
      */
     String competeAllCount(CompeteDto.CompeteTime params) throws IOException;
 
+
+    String iCompetitionOrderService(QueryDto<CompeteDto.CompeteTime> params);
+
     /**
      * 日程安排中间表
      * @param  params 大赛id
@@ -81,6 +84,4 @@ public interface IExcelService {
      */
     TableVo.SchedulePlan schedulePlanning(CompeteDto.CompeteTime params);
 
-
-
 }

mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@@ -120,7 +120,6 @@ public class ProvinceService implements IProvinceService {
             player.setId(snowflake.nextId());
             player.setName(param.getPlayerName());
 
-
             if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); }
             //身份证不能为空，且正确
             if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
@@ -159,7 +158,7 @@ public class ProvinceService implements IProvinceService {
             //判断各种证件是否为空
             if(ObjectUtil.isNull(param.getIdCardFront()) && ObjectUtil.isNotNull(param.getIdCardBack())){
                 param.setIdCardFront(param.getIdCardBack());
-                param.setIdCardBack(null);
+                param.setIdCardBack(0L);
             }
             if(ObjectUtil.isNull(param.getIdCardFront())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("身份证/户口本信息")); }
             if(ObjectUtil.isNull(param.getIdPhone())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("证件照")); }
@@ -184,7 +183,7 @@ public class ProvinceService implements IProvinceService {
             CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
             log.info("查找需要修改的选手信息：{}",player);
             if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
-            //身份证不能为空，且正确
+            //身份证正确
             if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
             //是否已注册
             CompetePlayerExample competePlayerExample = new CompetePlayerExample();
@@ -211,14 +210,24 @@ public class ProvinceService implements IProvinceService {
             }
             //字段不为空则修改
             if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
-            if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
-            if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
-            if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());}
-            if(ObjectUtil.isNotNull(param.getGroupRemark())){player.setGroupRemark((byte) param.getGroupRemark());}
+
+            if(getJoinProject(player.getId()) && (!param.getIdCard().equalsIgnoreCase(player.getIdCard())
+                    || param.getGroupRemark() != player.getGroupRemark())){
+                throw new BaseException(CodeEnum.ALREADY_JOIN_PROJECT);
+            }
+//            if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
+//            if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
+//            if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());}
+//            if(ObjectUtil.isNotNull(param.getGroupRemark())){player.setGroupRemark((byte) param.getGroupRemark());}
+
             if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
 
-            if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());}
-            if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(param.getIdCardBack());}
+//            if(ObjectUtil.isNotNull(param.getIdCardFront())){
+                player.setIdCardFrontFile(param.getIdCardFront() == null ? 0 : param.getIdCardFront());
+//            }
+//            if(ObjectUtil.isNotNull(param.getIdCardBack())){
+                player.setIdCardBackFile(param.getIdCardBack() == null ? 0 : param.getIdCardBack());
+//            }
             if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(param.getIdPhone());}
             if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());}
             if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());}
@@ -399,28 +408,31 @@ public class ProvinceService implements IProvinceService {
         Long playerId = param.getPlayerId();
         CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
         if (ObjectUtil.isNotNull(competePlayer)){
+            if(getJoinProject(playerId)){
+                throw new BaseException(CodeEnum.ALREADY_JOIN_PROJECT_DEL);
+            }
             competePlayer.setRecStatus((byte) 2);
             competePlayerMapper.updateByPrimaryKeySelective(competePlayer);
-            //删除成员报名的信息
-            CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
-            projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId);
-            List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
-            if(CollectionUtil.isNotEmpty(projectPlayerList)){
-                projectPlayerList.forEach(projectPlayer -> {
-                    projectPlayer.setRecStatus((byte) 2);
-                    projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer);
-                });
-            }
-            //团队
-            CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample();
-            memberExample.createCriteria().andPlayerIdEqualTo(playerId);
-            List<CompeteTeamMember> memberList = teamMemberMapper.selectByExample(memberExample);
-            if(CollectionUtil.isNotEmpty(memberList)){
-                memberList.forEach(member -> {
-                    member.setRecStatus((byte) 2);
-                    teamMemberMapper.updateByPrimaryKeySelective(member);
-                });
-            }
+//            //删除成员报名的信息
+//            CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
+//            projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId);
+//            List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
+//            if(CollectionUtil.isNotEmpty(projectPlayerList)){
+//                projectPlayerList.forEach(projectPlayer -> {
+//                    projectPlayer.setRecStatus((byte) 2);
+//                    projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer);
+//                });
+//            }
+//            //团队
+//            CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample();
+//            memberExample.createCriteria().andPlayerIdEqualTo(playerId);
+//            List<CompeteTeamMember> memberList = teamMemberMapper.selectByExample(memberExample);
+//            if(CollectionUtil.isNotEmpty(memberList)){
+//                memberList.forEach(member -> {
+//                    member.setRecStatus((byte) 2);
+//                    teamMemberMapper.updateByPrimaryKeySelective(member);
+//                });
+//            }
 //            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
 //            competePlayerExample.createCriteria().andIdEqualTo(playerId);
 //            competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample);
@@ -456,6 +468,12 @@ public class ProvinceService implements IProvinceService {
             if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){
                 throw  new BaseException(CodeEnum.ID_CARD_ERROR);
             }
+            //检查性别与身份证是否匹配
+            int gender = IdcardUtil.getGenderByIdCard(param.getIdCard());
+            if(gender != param.getGender()){
+                throw new BaseException(CodeEnum.GENDER_ERROR);
+            }
+
             //证件照判断
             if (param.getIdentity() == 1 && ObjectUtil.isNull(param.getIdPhoto())){
                 throw new BaseException(CodeEnum.PHOTO_IS_EMPTY);
@@ -824,5 +842,20 @@ public class ProvinceService implements IProvinceService {
             }
         }
     }
+
+
+    /**
+     * 查询运动员是否参加了比赛
+     */
+    private boolean getJoinProject(Long playerId){
+        CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
+        projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId);
+        if(projectPlayerMapper.countByExample(projectPlayerExample) != 0){
+            return true;
+        }
+        CompeteTeamMemberExample teamMemberExample = new CompeteTeamMemberExample();
+        teamMemberExample.createCriteria().andPlayerIdEqualTo(playerId);
+        return teamMemberMapper.countByExample(teamMemberExample) != 0;
+    }
 }
 

mt/src/main/resources/application.yml

@@ -2,3 +2,4 @@ spring:
   profiles:
     active: dev
     include: common, util-dev
+

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -15,7 +15,14 @@
             <result column="memberMax" property="memberMax"/>
         </collection>
     </resultMap>
-
+    <resultMap id="projectMes" type="com.ccsens.mt.bean.vo.CompeteExcelVo$AllProject">
+        <id column="id" property="id"/>
+        <result column="team" property="team"/>
+        <result column="projectName" property="projectName" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+        <result column="siteNum" property="siteNum" />
+    </resultMap>
     <resultMap id="group_player" type="com.ccsens.mt.bean.vo.ProvinceCompeteVo$GroupAndPlayer">
         <id column="groupId" property="groupId"/>
         <result column="groupName" property="groupName"/>
@@ -53,7 +60,7 @@
         if(pp.id is null and a.mId is null,0,1) as joinProject
         FROM
 		t_compete_group cg
-        LEFT JOIN t_compete_player p on (cg.id = p.compete_group_id or (cg.sex = p.gender and cg.group_remark = p.group_remark))
+        LEFT JOIN t_compete_player p on cg.id = p.compete_group_id
         LEFT JOIN t_compete_project_player pp on p.id = pp.player_id and pp.project_id = #{projectId} and pp.rec_status = 0
         LEFT JOIN
         ( SELECT
@@ -347,6 +354,24 @@
             and t.rec_status = 0
             and m.rec_status = 0
     </select>
+    <select id="selectProjectByType" resultMap="projectMes">
+         select
+             tcp.id as id,
+             tcp.name as projectName,
+             tcp.team as team,
+             tcpc.start_time as startTime,
+             tcpc.end_time as endTime,
+             tcpc.site_num as siteNum
+         FROM t_compete_project tcp
+         left JOIN t_compete_time tct on tcp.type=tct.type
+         left JOIN t_compete_project_config tcpc on  tcpc.project_id=tcp.id
+         where
+             tct.id=#{id} and
+             tcp.rec_status=0 and
+             tcpc.rec_status=0 and
+             tct.rec_status=0
+         ORDER BY tcpc.start_time
+    </select>
     <select id="queryPlayersByTeamProject" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$PlayerInfoByGroup">
         SELECT
         p.id as playerId,
@@ -361,5 +386,4 @@
             and m.rec_status = 0
             and p.rec_status = 0
     </select>
-
 </mapper>

mt/src/main/resources/mapper_dao/CompetePlayerDao.xml

@@ -30,7 +30,15 @@
         <collection property="nums" ofType="Integer" column="projectId" select="getTeamJoinNumByProjectId">
         </collection>
     </resultMap>
-
+    <resultMap id="singleOrderPlayer" type="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayer">
+        <id column="groupId" property="groupId" />
+        <result column="groupName" property="groupName" />
+        <collection property="companyNameList" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayerList">
+            <id column="companyId" property="teamId"/>
+            <result column="companyName" property="companyName"/>
+            <result column="playerName" property="playerNames"/>
+        </collection>
+    </resultMap>
     <select id="getInfo" resultType="com.ccsens.mt.bean.vo.CompeteVo$GetPlayerInfo">
           SELECT
             p.id AS playerId,
@@ -264,4 +272,32 @@
         and g.rec_status in (0,1)
         ORDER BY g.sequence
     </select>
+    <select id="selectBySexAndRemark" resultType="com.ccsens.mt.bean.po.CompeteGroup">
+        SELECT
+            tcg.`group_name` as groupName
+        FROM
+            t_compete_group tcg
+        WHERE
+            tcg.`sex`=#{sex}
+            and tcg.`group_remark`=#{remark}
+    </select>
+    <select id="selectSinglePlayerByProjectId" resultMap="singleOrderPlayer">
+        select
+             tcg.id as groupId,
+             tcg.group_name as groupName,
+             tcc.id as companyId,
+             tcc.name as companyName,
+		     tcp.name as playerName
+         FROM
+             t_compete_project_player tcpp
+             LEFT JOIN t_compete_player tcp on tcp.id=tcpp.player_id
+             LEFT JOIN t_compete_company tcc on tcp.company_id=tcc.id
+             LEFT JOIN t_compete_group tcg on tcg.id=tcp.compete_group_id
+         WHERE
+             tcpp.project_id=#{id}
+             and tcpp.rec_status=0
+             and tcp.rec_status=0
+             and tcc.rec_status=0
+             and tcg.rec_status=0
+    </select>
 </mapper>

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -24,4 +24,101 @@
     FROM  t_compete_project_config a , t_compete_project b
     where a.project_id = b.id
   </select>
+  <select id="selectSingle" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+    SELECT
+    tcpro.id as projectId,
+    tcpro.name as competeProject,
+    tcg.group_name as competeGroup,
+    tcc.`name` as joinTeam,
+    tcp.`name` as name,
+    tcp.gender as gender,
+    tcp.id_card as idCard,
+    (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as id_card_front_file,
+    (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as id_card_back_file,
+    (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as id_photo_file,
+    (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as student_record_file,
+    (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as health_record_file,
+    (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as insurance_record_file
+    from
+    t_compete_project tcpro LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id
+    LEFT JOIN t_compete_player tcp on tcpp.player_id = tcp.id
+    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    LEFT JOIN t_compete_time tct on tct.type = tcpro.type
+    where
+    <if test="competeTimeId !=null and competeTimeId! = ''">
+       tct.id = #{competeTimeId}
+    </if>
+    <if test="projectId !=null and projectId! = ''">
+      and tcpro.id = #{projectId}
+    </if>
+    <if test="groupId !=null and groupId! = ''">
+      and tcg.id = #{groupId}
+    </if>
+    <if test="companyId !=null and companyId! = ''">
+      and tcc.id = #{companyId}
+    </if>
+    <if test="competeTimeId !=null and competeTimeId! = ''">
+      and tct.id = #{competeTimeId}
+    </if>
+    <if test="idCard !=null and idCard! = ''">
+      and tcp.id_card = #{idCard}
+    </if>
+    and tcp.rec_status = 0
+    and tcc.rec_status = 0
+    and tcpp.rec_status = 0
+    and tcpro.rec_status = 0
+    and tct.rec_status = 0
+  </select>
+  <select id="selectGroup" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+    SELECT
+    tcpro.id as projectId,
+    tcpro.name as competeProject,
+    tcg.group_name as competeGroup,
+    tcc.`name` as joinTeam,
+    tcp.`name` as name,
+    tcp.gender as gender,
+    tcp.id_card as idCard,
+    (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as id_card_front_file,
+    (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as id_card_back_file,
+    (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as id_photo_file,
+    (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as student_record_file,
+    (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as health_record_file,
+    (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as insurance_record_file
+    from
+    t_compete_project tcpro LEFT JOIN t_compete_team tct on tcpro.id = tct.project_id
+    LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
+    LEFT JOIN t_compete_player tcp on tcp.id = tctm.player_id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+    LEFT JOIN t_compete_time tctt on tctt.type = tcpro.type
+    WHERE
+    <if test="competeTimeId !=null and competeTimeId! = ''">
+       tct.id = #{competeTimeId}
+    </if>
+    <if test="projectId !=null and projectId! = ''">
+      and tcpro.id = #{projectId}
+    </if>
+    <if test="groupId !=null and groupId! = ''">
+      and tcg.id = #{groupId}
+    </if>
+    <if test="companyId !=null and companyId! = ''">
+      and tcc.id = #{companyId}
+    </if>
+    <if test="competeTimeId !=null and competeTimeId! = ''">
+      and tct.id = #{competeTimeId}
+    </if>
+    <if test="idCard !=null and idCard! = ''">
+      and tcp.id_card = #{idCard}
+    </if>
+    and tcpro.rec_status = 0
+    and tctm.rec_status = 0
+    and tcp.rec_status = 0
+    and tcc.rec_status = 0
+    and tcg.rec_status = 0
+    and tct.rec_status = 0
+    and tctt.rec_status = 0
+  </select>
+
+
 </mapper>

mt/src/main/resources/mapper_dao/CompeteTeamDao.xml

@@ -14,7 +14,15 @@
         <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
         <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     </resultMap>
-
+    <resultMap id="teamOrderPlayer" type="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayer">
+        <id column="groupId" property="groupId" />
+        <result column="groupName" property="groupName" />
+        <collection property="companyNameList" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayerList">
+            <id column="teamId" property="teamId"/>
+            <result column="companyName" property="companyName"/>
+            <result column="playerNames" property="playerNames"/>
+        </collection>
+    </resultMap>
     <resultMap id="getTeamByProjectId" type="com.ccsens.mt.bean.vo.CompeteVo$TeamInfoByProject">
         <id column="teamId" property="teamId" />
         <result column="creatorId" property="creatorId" />
@@ -251,4 +259,25 @@
         and pp.rec_status = 0
         and p.rec_status = 0
     </select>
+    <select id="selectTeamMemberByProjectId" resultMap="teamOrderPlayer">
+        SELECT
+        tcg.id as groupId,
+        tct.id as teamId,
+        tcg.group_name as groupName,
+        tcc.`name` as companyName,
+        GROUP_CONCAT(tcp.`name` separator '、') as playerNames
+        FROM
+            `t_compete_team` tct
+            LEFT JOIN `t_compete_team_member` tctm ON tct.id = tctm.compete_team_id
+            LEFT JOIN t_compete_group tcg ON tct.gender_group = tcg.sex
+            AND tct.group_remark = tcg.group_remark
+            left JOIN t_compete_player tcp on tcp.id=tctm.player_id
+            left join t_compete_company tcc on tct.company_id=tcc.id
+
+        WHERE
+            tct.project_id = #{projectId}
+            AND tct.rec_status = 0
+            AND tctm.rec_status = 0
+            AND tcg.rec_status =0
+    </select>
 </mapper>

mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml

@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.mt.persist.mapper.CompeteCountScoreMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteCountScore">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="site_order_id" jdbcType="BIGINT" property="siteOrderId" />
+    <result column="chief_judgment_score" jdbcType="BIGINT" property="chiefJudgmentScore" />
+    <result column="judgment_a_score" jdbcType="INTEGER" property="judgmentAScore" />
+    <result column="judgment_b_score2" jdbcType="INTEGER" property="judgmentBScore2" />
+    <result column="should_times" jdbcType="INTEGER" property="shouldTimes" />
+    <result column="deduct_times" jdbcType="INTEGER" property="deductTimes" />
+    <result column="deduct_cause" jdbcType="VARCHAR" property="deductCause" />
+    <result column="final_score" jdbcType="INTEGER" property="finalScore" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, 
+    judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, 
+    updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_compete_count_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_compete_count_score
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_compete_count_score
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample">
+    delete from t_compete_count_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
+    insert into t_compete_count_score (id, compete_time_id, project_id, 
+      site_order_id, chief_judgment_score, judgment_a_score, 
+      judgment_b_score2, should_times, deduct_times, 
+      deduct_cause, final_score, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, 
+      #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, 
+      #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, 
+      #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
+    insert into t_compete_count_score
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="competeTimeId != null">
+        compete_time_id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="siteOrderId != null">
+        site_order_id,
+      </if>
+      <if test="chiefJudgmentScore != null">
+        chief_judgment_score,
+      </if>
+      <if test="judgmentAScore != null">
+        judgment_a_score,
+      </if>
+      <if test="judgmentBScore2 != null">
+        judgment_b_score2,
+      </if>
+      <if test="shouldTimes != null">
+        should_times,
+      </if>
+      <if test="deductTimes != null">
+        deduct_times,
+      </if>
+      <if test="deductCause != null">
+        deduct_cause,
+      </if>
+      <if test="finalScore != null">
+        final_score,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="competeTimeId != null">
+        #{competeTimeId,jdbcType=BIGINT},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="siteOrderId != null">
+        #{siteOrderId,jdbcType=BIGINT},
+      </if>
+      <if test="chiefJudgmentScore != null">
+        #{chiefJudgmentScore,jdbcType=BIGINT},
+      </if>
+      <if test="judgmentAScore != null">
+        #{judgmentAScore,jdbcType=INTEGER},
+      </if>
+      <if test="judgmentBScore2 != null">
+        #{judgmentBScore2,jdbcType=INTEGER},
+      </if>
+      <if test="shouldTimes != null">
+        #{shouldTimes,jdbcType=INTEGER},
+      </if>
+      <if test="deductTimes != null">
+        #{deductTimes,jdbcType=INTEGER},
+      </if>
+      <if test="deductCause != null">
+        #{deductCause,jdbcType=VARCHAR},
+      </if>
+      <if test="finalScore != null">
+        #{finalScore,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample" resultType="java.lang.Long">
+    select count(*) from t_compete_count_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_compete_count_score
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.competeTimeId != null">
+        compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=BIGINT},
+      </if>
+      <if test="record.siteOrderId != null">
+        site_order_id = #{record.siteOrderId,jdbcType=BIGINT},
+      </if>
+      <if test="record.chiefJudgmentScore != null">
+        chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT},
+      </if>
+      <if test="record.judgmentAScore != null">
+        judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER},
+      </if>
+      <if test="record.judgmentBScore2 != null">
+        judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER},
+      </if>
+      <if test="record.shouldTimes != null">
+        should_times = #{record.shouldTimes,jdbcType=INTEGER},
+      </if>
+      <if test="record.deductTimes != null">
+        deduct_times = #{record.deductTimes,jdbcType=INTEGER},
+      </if>
+      <if test="record.deductCause != null">
+        deduct_cause = #{record.deductCause,jdbcType=VARCHAR},
+      </if>
+      <if test="record.finalScore != null">
+        final_score = #{record.finalScore,jdbcType=INTEGER},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_compete_count_score
+    set id = #{record.id,jdbcType=BIGINT},
+      compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
+      project_id = #{record.projectId,jdbcType=BIGINT},
+      site_order_id = #{record.siteOrderId,jdbcType=BIGINT},
+      chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT},
+      judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER},
+      judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER},
+      should_times = #{record.shouldTimes,jdbcType=INTEGER},
+      deduct_times = #{record.deductTimes,jdbcType=INTEGER},
+      deduct_cause = #{record.deductCause,jdbcType=VARCHAR},
+      final_score = #{record.finalScore,jdbcType=INTEGER},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
+    update t_compete_count_score
+    <set>
+      <if test="competeTimeId != null">
+        compete_time_id = #{competeTimeId,jdbcType=BIGINT},
+      </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="siteOrderId != null">
+        site_order_id = #{siteOrderId,jdbcType=BIGINT},
+      </if>
+      <if test="chiefJudgmentScore != null">
+        chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT},
+      </if>
+      <if test="judgmentAScore != null">
+        judgment_a_score = #{judgmentAScore,jdbcType=INTEGER},
+      </if>
+      <if test="judgmentBScore2 != null">
+        judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER},
+      </if>
+      <if test="shouldTimes != null">
+        should_times = #{shouldTimes,jdbcType=INTEGER},
+      </if>
+      <if test="deductTimes != null">
+        deduct_times = #{deductTimes,jdbcType=INTEGER},
+      </if>
+      <if test="deductCause != null">
+        deduct_cause = #{deductCause,jdbcType=VARCHAR},
+      </if>
+      <if test="finalScore != null">
+        final_score = #{finalScore,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
+    update t_compete_count_score
+    set compete_time_id = #{competeTimeId,jdbcType=BIGINT},
+      project_id = #{projectId,jdbcType=BIGINT},
+      site_order_id = #{siteOrderId,jdbcType=BIGINT},
+      chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT},
+      judgment_a_score = #{judgmentAScore,jdbcType=INTEGER},
+      judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER},
+      should_times = #{shouldTimes,jdbcType=INTEGER},
+      deduct_times = #{deductTimes,jdbcType=INTEGER},
+      deduct_cause = #{deductCause,jdbcType=VARCHAR},
+      final_score = #{finalScore,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

mt/src/main/resources/mapper_raw/CompetePlayerLookMapper.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.mt.persist.mapper.CompetePlayerLookMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompetePlayerLook">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="look_status" jdbcType="TINYINT" property="lookStatus" />
+    <result column="look_time" jdbcType="BIGINT" property="lookTime" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, company_id, look_status, look_time, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompetePlayerLookExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_compete_player_look
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_compete_player_look
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_compete_player_look
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompetePlayerLookExample">
+    delete from t_compete_player_look
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompetePlayerLook">
+    insert into t_compete_player_look (id, company_id, look_status, 
+      look_time, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, #{lookStatus,jdbcType=TINYINT}, 
+      #{lookTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompetePlayerLook">
+    insert into t_compete_player_look
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="lookStatus != null">
+        look_status,
+      </if>
+      <if test="lookTime != null">
+        look_time,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="lookStatus != null">
+        #{lookStatus,jdbcType=TINYINT},
+      </if>
+      <if test="lookTime != null">
+        #{lookTime,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompetePlayerLookExample" resultType="java.lang.Long">
+    select count(*) from t_compete_player_look
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_compete_player_look
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=BIGINT},
+      </if>
+      <if test="record.lookStatus != null">
+        look_status = #{record.lookStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.lookTime != null">
+        look_time = #{record.lookTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_compete_player_look
+    set id = #{record.id,jdbcType=BIGINT},
+      company_id = #{record.companyId,jdbcType=BIGINT},
+      look_status = #{record.lookStatus,jdbcType=TINYINT},
+      look_time = #{record.lookTime,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.mt.bean.po.CompetePlayerLook">
+    update t_compete_player_look
+    <set>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="lookStatus != null">
+        look_status = #{lookStatus,jdbcType=TINYINT},
+      </if>
+      <if test="lookTime != null">
+        look_time = #{lookTime,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompetePlayerLook">
+    update t_compete_player_look
+    set company_id = #{companyId,jdbcType=BIGINT},
+      look_status = #{lookStatus,jdbcType=TINYINT},
+      look_time = #{lookTime,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.mt.persist.mapper.CompeteStartOrderMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteStartOrder">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="player_id" jdbcType="BIGINT" property="playerId" />
+    <result column="compete_order" jdbcType="TINYINT" property="competeOrder" />
+    <result column="site" jdbcType="TINYINT" property="site" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, player_id, compete_order, site, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_compete_start_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_compete_start_order
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_compete_start_order
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample">
+    delete from t_compete_start_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
+    insert into t_compete_start_order (id, player_id, compete_order, 
+      site, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{competeOrder,jdbcType=TINYINT}, 
+      #{site,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
+    insert into t_compete_start_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="playerId != null">
+        player_id,
+      </if>
+      <if test="competeOrder != null">
+        compete_order,
+      </if>
+      <if test="site != null">
+        site,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="playerId != null">
+        #{playerId,jdbcType=BIGINT},
+      </if>
+      <if test="competeOrder != null">
+        #{competeOrder,jdbcType=TINYINT},
+      </if>
+      <if test="site != null">
+        #{site,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample" resultType="java.lang.Long">
+    select count(*) from t_compete_start_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_compete_start_order
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.playerId != null">
+        player_id = #{record.playerId,jdbcType=BIGINT},
+      </if>
+      <if test="record.competeOrder != null">
+        compete_order = #{record.competeOrder,jdbcType=TINYINT},
+      </if>
+      <if test="record.site != null">
+        site = #{record.site,jdbcType=TINYINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_compete_start_order
+    set id = #{record.id,jdbcType=BIGINT},
+      player_id = #{record.playerId,jdbcType=BIGINT},
+      compete_order = #{record.competeOrder,jdbcType=TINYINT},
+      site = #{record.site,jdbcType=TINYINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
+    update t_compete_start_order
+    <set>
+      <if test="playerId != null">
+        player_id = #{playerId,jdbcType=BIGINT},
+      </if>
+      <if test="competeOrder != null">
+        compete_order = #{competeOrder,jdbcType=TINYINT},
+      </if>
+      <if test="site != null">
+        site = #{site,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
+    update t_compete_start_order
+    set player_id = #{playerId,jdbcType=BIGINT},
+      compete_order = #{competeOrder,jdbcType=TINYINT},
+      site = #{site,jdbcType=TINYINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

mt/src/main/resources/mapper_raw/CompeteVideoMapper.xml

@@ -4,13 +4,12 @@
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteVideo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
-    <result column="compete_code" jdbcType="VARCHAR" property="competeCode" />
-    <result column="team" jdbcType="TINYINT" property="team" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
     <result column="player_id" jdbcType="BIGINT" property="playerId" />
-    <result column="file_id" jdbcType="BIGINT" property="fileId" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="video_url" jdbcType="VARCHAR" property="videoUrl" />
-    <result column="time" jdbcType="BIGINT" property="time" />
-    <result column="upload_user_id" jdbcType="BIGINT" property="uploadUserId" />
+    <result column="upload_time" jdbcType="BIGINT" property="uploadTime" />
+    <result column="upload_status" jdbcType="TINYINT" property="uploadStatus" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -74,7 +73,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, compete_time_id, compete_code, team, player_id, file_id, video_url, time, upload_user_id, 
+    id, compete_time_id, project_id, player_id, user_id, video_url, upload_time, upload_status, 
     created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteVideoExample" resultMap="BaseResultMap">
@@ -108,16 +107,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteVideo">
-    insert into t_compete_video (id, compete_time_id, compete_code, 
-      team, player_id, file_id, 
-      video_url, time, upload_user_id, 
-      created_at, updated_at, rec_status
-      )
-    values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{competeCode,jdbcType=VARCHAR}, 
-      #{team,jdbcType=TINYINT}, #{playerId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT}, 
-      #{videoUrl,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{uploadUserId,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
-      )
+    insert into t_compete_video (id, compete_time_id, project_id, 
+      player_id, user_id, video_url, 
+      upload_time, upload_status, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, 
+      #{playerId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{videoUrl,jdbcType=VARCHAR}, 
+      #{uploadTime,jdbcType=BIGINT}, #{uploadStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteVideo">
     insert into t_compete_video
@@ -128,26 +125,23 @@
       <if test="competeTimeId != null">
         compete_time_id,
       </if>
-      <if test="competeCode != null">
-        compete_code,
-      </if>
-      <if test="team != null">
-        team,
+      <if test="projectId != null">
+        project_id,
       </if>
       <if test="playerId != null">
         player_id,
       </if>
-      <if test="fileId != null">
-        file_id,
+      <if test="userId != null">
+        user_id,
       </if>
       <if test="videoUrl != null">
         video_url,
       </if>
-      <if test="time != null">
-        time,
+      <if test="uploadTime != null">
+        upload_time,
       </if>
-      <if test="uploadUserId != null">
-        upload_user_id,
+      <if test="uploadStatus != null">
+        upload_status,
       </if>
       <if test="createdAt != null">
         created_at,
@@ -166,26 +160,23 @@
       <if test="competeTimeId != null">
         #{competeTimeId,jdbcType=BIGINT},
       </if>
-      <if test="competeCode != null">
-        #{competeCode,jdbcType=VARCHAR},
-      </if>
-      <if test="team != null">
-        #{team,jdbcType=TINYINT},
+      <if test="projectId != null">
+        #{projectId,jdbcType=BIGINT},
       </if>
       <if test="playerId != null">
         #{playerId,jdbcType=BIGINT},
       </if>
-      <if test="fileId != null">
-        #{fileId,jdbcType=BIGINT},
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
       </if>
       <if test="videoUrl != null">
         #{videoUrl,jdbcType=VARCHAR},
       </if>
-      <if test="time != null">
-        #{time,jdbcType=BIGINT},
+      <if test="uploadTime != null">
+        #{uploadTime,jdbcType=BIGINT},
       </if>
-      <if test="uploadUserId != null">
-        #{uploadUserId,jdbcType=BIGINT},
+      <if test="uploadStatus != null">
+        #{uploadStatus,jdbcType=TINYINT},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -213,26 +204,23 @@
       <if test="record.competeTimeId != null">
         compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       </if>
-      <if test="record.competeCode != null">
-        compete_code = #{record.competeCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.team != null">
-        team = #{record.team,jdbcType=TINYINT},
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=BIGINT},
       </if>
       <if test="record.playerId != null">
         player_id = #{record.playerId,jdbcType=BIGINT},
       </if>
-      <if test="record.fileId != null">
-        file_id = #{record.fileId,jdbcType=BIGINT},
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
       </if>
       <if test="record.videoUrl != null">
         video_url = #{record.videoUrl,jdbcType=VARCHAR},
       </if>
-      <if test="record.time != null">
-        time = #{record.time,jdbcType=BIGINT},
+      <if test="record.uploadTime != null">
+        upload_time = #{record.uploadTime,jdbcType=BIGINT},
       </if>
-      <if test="record.uploadUserId != null">
-        upload_user_id = #{record.uploadUserId,jdbcType=BIGINT},
+      <if test="record.uploadStatus != null">
+        upload_status = #{record.uploadStatus,jdbcType=TINYINT},
       </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -252,13 +240,12 @@
     update t_compete_video
     set id = #{record.id,jdbcType=BIGINT},
       compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
-      compete_code = #{record.competeCode,jdbcType=VARCHAR},
-      team = #{record.team,jdbcType=TINYINT},
+      project_id = #{record.projectId,jdbcType=BIGINT},
       player_id = #{record.playerId,jdbcType=BIGINT},
-      file_id = #{record.fileId,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=BIGINT},
       video_url = #{record.videoUrl,jdbcType=VARCHAR},
-      time = #{record.time,jdbcType=BIGINT},
-      upload_user_id = #{record.uploadUserId,jdbcType=BIGINT},
+      upload_time = #{record.uploadTime,jdbcType=BIGINT},
+      upload_status = #{record.uploadStatus,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -272,26 +259,23 @@
       <if test="competeTimeId != null">
         compete_time_id = #{competeTimeId,jdbcType=BIGINT},
       </if>
-      <if test="competeCode != null">
-        compete_code = #{competeCode,jdbcType=VARCHAR},
-      </if>
-      <if test="team != null">
-        team = #{team,jdbcType=TINYINT},
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=BIGINT},
       </if>
       <if test="playerId != null">
         player_id = #{playerId,jdbcType=BIGINT},
       </if>
-      <if test="fileId != null">
-        file_id = #{fileId,jdbcType=BIGINT},
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
       </if>
       <if test="videoUrl != null">
         video_url = #{videoUrl,jdbcType=VARCHAR},
       </if>
-      <if test="time != null">
-        time = #{time,jdbcType=BIGINT},
+      <if test="uploadTime != null">
+        upload_time = #{uploadTime,jdbcType=BIGINT},
       </if>
-      <if test="uploadUserId != null">
-        upload_user_id = #{uploadUserId,jdbcType=BIGINT},
+      <if test="uploadStatus != null">
+        upload_status = #{uploadStatus,jdbcType=TINYINT},
       </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -308,13 +292,12 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteVideo">
     update t_compete_video
     set compete_time_id = #{competeTimeId,jdbcType=BIGINT},
-      compete_code = #{competeCode,jdbcType=VARCHAR},
-      team = #{team,jdbcType=TINYINT},
+      project_id = #{projectId,jdbcType=BIGINT},
       player_id = #{playerId,jdbcType=BIGINT},
-      file_id = #{fileId,jdbcType=BIGINT},
+      user_id = #{userId,jdbcType=BIGINT},
       video_url = #{videoUrl,jdbcType=VARCHAR},
-      time = #{time,jdbcType=BIGINT},
-      upload_user_id = #{uploadUserId,jdbcType=BIGINT},
+      upload_time = #{uploadTime,jdbcType=BIGINT},
+      upload_status = #{uploadStatus,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -176,6 +176,8 @@ public enum CodeEnum {
     MEMBER_NUM_ERROR(145,"参赛人数不满足比赛人数要求",true),
     GENDER_ERROR(146,"请选择正确的性别",true),
     JOIN_AUTH_GROUP(147,"已参加了其他组别，无法再次报名",true),
+    ALREADY_JOIN_PROJECT(148,"该选手已经参加了比赛，不可修改身份证组别等信息",true),
+    ALREADY_JOIN_PROJECT_DEL(149,"取消报名后可删除",true),
 
     ;
 

util/src/test/java/com/ccsens/util/OtherTest.java

@@ -9,6 +9,8 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Slf4j
 public class OtherTest {
@@ -36,5 +38,11 @@ public class OtherTest {
         System.out.println(file1);
         ImageUtil.scale(file1,file2,2);
     }
+    @Test
+    public void func3(){
+        SimpleDateFormat sdf2 = new SimpleDateFormat("MM-dd a");
+        String sd2 = sdf2.format(new Date(1605074997152L));
+        System.out.println(sd2);
+    }
 
 }