ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

20210527跳绳出场顺序表

recovery
zy_Java 5 years ago
parent
4b0a44c5ec
commit
be5981ff77
8 changed files with 420 additions and 417 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java
  2. 412
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java
  3. 2
      mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
  4. 144
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  5. 4
      mt/src/main/resources/application.yml
  6. 20
      mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
  7. 33
      mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
  8. 138
      mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml

84
mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java
View File

@ -12,25 +12,25 @@ public class CompeteStartOrder implements Serializable {
private Byte team; private Byte team;
private Byte competeOrder; private Integer competeOrder;
private Byte site; private Byte site;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private Long taskId; private Long taskId;
private Long startTime; private Long startTime;
private Long endTime; private Long endTime;
private Byte waiver;
private String remark; private String remark;
private Byte waiver; private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -66,11 +66,11 @@ public class CompeteStartOrder implements Serializable {
this.team = team; this.team = team;
} }
public Byte getCompeteOrder() { public Integer getCompeteOrder() {
return competeOrder; return competeOrder;
} }
public void setCompeteOrder(Byte competeOrder) { public void setCompeteOrder(Integer competeOrder) {
this.competeOrder = competeOrder; this.competeOrder = competeOrder;
} }
@ -82,30 +82,6 @@ public class CompeteStartOrder implements Serializable {
this.site = 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;
}
public Long getTaskId() { public Long getTaskId() {
return taskId; return taskId;
} }
@ -130,6 +106,14 @@ public class CompeteStartOrder implements Serializable {
this.endTime = endTime; this.endTime = endTime;
} }
public Byte getWaiver() {
return waiver;
}
public void setWaiver(Byte waiver) {
this.waiver = waiver;
}
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
@ -138,12 +122,28 @@ public class CompeteStartOrder implements Serializable {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
public Byte getWaiver() { public Date getCreatedAt() {
return waiver; return createdAt;
} }
public void setWaiver(Byte waiver) { public void setCreatedAt(Date createdAt) {
this.waiver = waiver; 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 @Override
@ -158,14 +158,14 @@ public class CompeteStartOrder implements Serializable {
sb.append(", team=").append(team); sb.append(", team=").append(team);
sb.append(", competeOrder=").append(competeOrder); sb.append(", competeOrder=").append(competeOrder);
sb.append(", site=").append(site); sb.append(", site=").append(site);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", taskId=").append(taskId); sb.append(", taskId=").append(taskId);
sb.append(", startTime=").append(startTime); sb.append(", startTime=").append(startTime);
sb.append(", endTime=").append(endTime); sb.append(", endTime=").append(endTime);
sb.append(", remark=").append(remark);
sb.append(", waiver=").append(waiver); sb.append(", waiver=").append(waiver);
sb.append(", remark=").append(remark);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }

412
mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java
View File

@ -355,52 +355,52 @@ public class CompeteStartOrderExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderEqualTo(Byte value) { public Criteria andCompeteOrderEqualTo(Integer value) {
addCriterion("compete_order =", value, "competeOrder"); addCriterion("compete_order =", value, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderNotEqualTo(Byte value) { public Criteria andCompeteOrderNotEqualTo(Integer value) {
addCriterion("compete_order <>", value, "competeOrder"); addCriterion("compete_order <>", value, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderGreaterThan(Byte value) { public Criteria andCompeteOrderGreaterThan(Integer value) {
addCriterion("compete_order >", value, "competeOrder"); addCriterion("compete_order >", value, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderGreaterThanOrEqualTo(Byte value) { public Criteria andCompeteOrderGreaterThanOrEqualTo(Integer value) {
addCriterion("compete_order >=", value, "competeOrder"); addCriterion("compete_order >=", value, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderLessThan(Byte value) { public Criteria andCompeteOrderLessThan(Integer value) {
addCriterion("compete_order <", value, "competeOrder"); addCriterion("compete_order <", value, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderLessThanOrEqualTo(Byte value) { public Criteria andCompeteOrderLessThanOrEqualTo(Integer value) {
addCriterion("compete_order <=", value, "competeOrder"); addCriterion("compete_order <=", value, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderIn(List<Byte> values) { public Criteria andCompeteOrderIn(List<Integer> values) {
addCriterion("compete_order in", values, "competeOrder"); addCriterion("compete_order in", values, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderNotIn(List<Byte> values) { public Criteria andCompeteOrderNotIn(List<Integer> values) {
addCriterion("compete_order not in", values, "competeOrder"); addCriterion("compete_order not in", values, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderBetween(Byte value1, Byte value2) { public Criteria andCompeteOrderBetween(Integer value1, Integer value2) {
addCriterion("compete_order between", value1, value2, "competeOrder"); addCriterion("compete_order between", value1, value2, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompeteOrderNotBetween(Byte value1, Byte value2) { public Criteria andCompeteOrderNotBetween(Integer value1, Integer value2) {
addCriterion("compete_order not between", value1, value2, "competeOrder"); addCriterion("compete_order not between", value1, value2, "competeOrder");
return (Criteria) this; return (Criteria) this;
} }
@ -465,493 +465,493 @@ public class CompeteStartOrderExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtIsNull() { public Criteria andTaskIdIsNull() {
addCriterion("created_at is null"); addCriterion("task_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtIsNotNull() { public Criteria andTaskIdIsNotNull() {
addCriterion("created_at is not null"); addCriterion("task_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtEqualTo(Date value) { public Criteria andTaskIdEqualTo(Long value) {
addCriterion("created_at =", value, "createdAt"); addCriterion("task_id =", value, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtNotEqualTo(Date value) { public Criteria andTaskIdNotEqualTo(Long value) {
addCriterion("created_at <>", value, "createdAt"); addCriterion("task_id <>", value, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtGreaterThan(Date value) { public Criteria andTaskIdGreaterThan(Long value) {
addCriterion("created_at >", value, "createdAt"); addCriterion("task_id >", value, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { public Criteria andTaskIdGreaterThanOrEqualTo(Long value) {
addCriterion("created_at >=", value, "createdAt"); addCriterion("task_id >=", value, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtLessThan(Date value) { public Criteria andTaskIdLessThan(Long value) {
addCriterion("created_at <", value, "createdAt"); addCriterion("task_id <", value, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtLessThanOrEqualTo(Date value) { public Criteria andTaskIdLessThanOrEqualTo(Long value) {
addCriterion("created_at <=", value, "createdAt"); addCriterion("task_id <=", value, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtIn(List<Date> values) { public Criteria andTaskIdIn(List<Long> values) {
addCriterion("created_at in", values, "createdAt"); addCriterion("task_id in", values, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtNotIn(List<Date> values) { public Criteria andTaskIdNotIn(List<Long> values) {
addCriterion("created_at not in", values, "createdAt"); addCriterion("task_id not in", values, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtBetween(Date value1, Date value2) { public Criteria andTaskIdBetween(Long value1, Long value2) {
addCriterion("created_at between", value1, value2, "createdAt"); addCriterion("task_id between", value1, value2, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtNotBetween(Date value1, Date value2) { public Criteria andTaskIdNotBetween(Long value1, Long value2) {
addCriterion("created_at not between", value1, value2, "createdAt"); addCriterion("task_id not between", value1, value2, "taskId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtIsNull() { public Criteria andStartTimeIsNull() {
addCriterion("updated_at is null"); addCriterion("start_time is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtIsNotNull() { public Criteria andStartTimeIsNotNull() {
addCriterion("updated_at is not null"); addCriterion("start_time is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtEqualTo(Date value) { public Criteria andStartTimeEqualTo(Long value) {
addCriterion("updated_at =", value, "updatedAt"); addCriterion("start_time =", value, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtNotEqualTo(Date value) { public Criteria andStartTimeNotEqualTo(Long value) {
addCriterion("updated_at <>", value, "updatedAt"); addCriterion("start_time <>", value, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtGreaterThan(Date value) { public Criteria andStartTimeGreaterThan(Long value) {
addCriterion("updated_at >", value, "updatedAt"); addCriterion("start_time >", value, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { public Criteria andStartTimeGreaterThanOrEqualTo(Long value) {
addCriterion("updated_at >=", value, "updatedAt"); addCriterion("start_time >=", value, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtLessThan(Date value) { public Criteria andStartTimeLessThan(Long value) {
addCriterion("updated_at <", value, "updatedAt"); addCriterion("start_time <", value, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { public Criteria andStartTimeLessThanOrEqualTo(Long value) {
addCriterion("updated_at <=", value, "updatedAt"); addCriterion("start_time <=", value, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtIn(List<Date> values) { public Criteria andStartTimeIn(List<Long> values) {
addCriterion("updated_at in", values, "updatedAt"); addCriterion("start_time in", values, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtNotIn(List<Date> values) { public Criteria andStartTimeNotIn(List<Long> values) {
addCriterion("updated_at not in", values, "updatedAt"); addCriterion("start_time not in", values, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtBetween(Date value1, Date value2) { public Criteria andStartTimeBetween(Long value1, Long value2) {
addCriterion("updated_at between", value1, value2, "updatedAt"); addCriterion("start_time between", value1, value2, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { public Criteria andStartTimeNotBetween(Long value1, Long value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt"); addCriterion("start_time not between", value1, value2, "startTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusIsNull() { public Criteria andEndTimeIsNull() {
addCriterion("rec_status is null"); addCriterion("end_time is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusIsNotNull() { public Criteria andEndTimeIsNotNull() {
addCriterion("rec_status is not null"); addCriterion("end_time is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusEqualTo(Byte value) { public Criteria andEndTimeEqualTo(Long value) {
addCriterion("rec_status =", value, "recStatus"); addCriterion("end_time =", value, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusNotEqualTo(Byte value) { public Criteria andEndTimeNotEqualTo(Long value) {
addCriterion("rec_status <>", value, "recStatus"); addCriterion("end_time <>", value, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusGreaterThan(Byte value) { public Criteria andEndTimeGreaterThan(Long value) {
addCriterion("rec_status >", value, "recStatus"); addCriterion("end_time >", value, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { public Criteria andEndTimeGreaterThanOrEqualTo(Long value) {
addCriterion("rec_status >=", value, "recStatus"); addCriterion("end_time >=", value, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusLessThan(Byte value) { public Criteria andEndTimeLessThan(Long value) {
addCriterion("rec_status <", value, "recStatus"); addCriterion("end_time <", value, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusLessThanOrEqualTo(Byte value) { public Criteria andEndTimeLessThanOrEqualTo(Long value) {
addCriterion("rec_status <=", value, "recStatus"); addCriterion("end_time <=", value, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusIn(List<Byte> values) { public Criteria andEndTimeIn(List<Long> values) {
addCriterion("rec_status in", values, "recStatus"); addCriterion("end_time in", values, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusNotIn(List<Byte> values) { public Criteria andEndTimeNotIn(List<Long> values) {
addCriterion("rec_status not in", values, "recStatus"); addCriterion("end_time not in", values, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusBetween(Byte value1, Byte value2) { public Criteria andEndTimeBetween(Long value1, Long value2) {
addCriterion("rec_status between", value1, value2, "recStatus"); addCriterion("end_time between", value1, value2, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { public Criteria andEndTimeNotBetween(Long value1, Long value2) {
addCriterion("rec_status not between", value1, value2, "recStatus"); addCriterion("end_time not between", value1, value2, "endTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdIsNull() { public Criteria andWaiverIsNull() {
addCriterion("task_id is null"); addCriterion("waiver is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdIsNotNull() { public Criteria andWaiverIsNotNull() {
addCriterion("task_id is not null"); addCriterion("waiver is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdEqualTo(Long value) { public Criteria andWaiverEqualTo(Byte value) {
addCriterion("task_id =", value, "taskId"); addCriterion("waiver =", value, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdNotEqualTo(Long value) { public Criteria andWaiverNotEqualTo(Byte value) {
addCriterion("task_id <>", value, "taskId"); addCriterion("waiver <>", value, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdGreaterThan(Long value) { public Criteria andWaiverGreaterThan(Byte value) {
addCriterion("task_id >", value, "taskId"); addCriterion("waiver >", value, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { public Criteria andWaiverGreaterThanOrEqualTo(Byte value) {
addCriterion("task_id >=", value, "taskId"); addCriterion("waiver >=", value, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdLessThan(Long value) { public Criteria andWaiverLessThan(Byte value) {
addCriterion("task_id <", value, "taskId"); addCriterion("waiver <", value, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdLessThanOrEqualTo(Long value) { public Criteria andWaiverLessThanOrEqualTo(Byte value) {
addCriterion("task_id <=", value, "taskId"); addCriterion("waiver <=", value, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdIn(List<Long> values) { public Criteria andWaiverIn(List<Byte> values) {
addCriterion("task_id in", values, "taskId"); addCriterion("waiver in", values, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdNotIn(List<Long> values) { public Criteria andWaiverNotIn(List<Byte> values) {
addCriterion("task_id not in", values, "taskId"); addCriterion("waiver not in", values, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdBetween(Long value1, Long value2) { public Criteria andWaiverBetween(Byte value1, Byte value2) {
addCriterion("task_id between", value1, value2, "taskId"); addCriterion("waiver between", value1, value2, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskIdNotBetween(Long value1, Long value2) { public Criteria andWaiverNotBetween(Byte value1, Byte value2) {
addCriterion("task_id not between", value1, value2, "taskId"); addCriterion("waiver not between", value1, value2, "waiver");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeIsNull() { public Criteria andRemarkIsNull() {
addCriterion("start_time is null"); addCriterion("remark is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeIsNotNull() { public Criteria andRemarkIsNotNull() {
addCriterion("start_time is not null"); addCriterion("remark is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeEqualTo(Long value) { public Criteria andRemarkEqualTo(String value) {
addCriterion("start_time =", value, "startTime"); addCriterion("remark =", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeNotEqualTo(Long value) { public Criteria andRemarkNotEqualTo(String value) {
addCriterion("start_time <>", value, "startTime"); addCriterion("remark <>", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeGreaterThan(Long value) { public Criteria andRemarkGreaterThan(String value) {
addCriterion("start_time >", value, "startTime"); addCriterion("remark >", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("start_time >=", value, "startTime"); addCriterion("remark >=", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeLessThan(Long value) { public Criteria andRemarkLessThan(String value) {
addCriterion("start_time <", value, "startTime"); addCriterion("remark <", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeLessThanOrEqualTo(Long value) { public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("start_time <=", value, "startTime"); addCriterion("remark <=", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeIn(List<Long> values) { public Criteria andRemarkLike(String value) {
addCriterion("start_time in", values, "startTime"); addCriterion("remark like", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeNotIn(List<Long> values) { public Criteria andRemarkNotLike(String value) {
addCriterion("start_time not in", values, "startTime"); addCriterion("remark not like", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeBetween(Long value1, Long value2) { public Criteria andRemarkIn(List<String> values) {
addCriterion("start_time between", value1, value2, "startTime"); addCriterion("remark in", values, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStartTimeNotBetween(Long value1, Long value2) { public Criteria andRemarkNotIn(List<String> values) {
addCriterion("start_time not between", value1, value2, "startTime"); addCriterion("remark not in", values, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeIsNull() { public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("end_time is null"); addCriterion("remark between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeIsNotNull() { public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("end_time is not null"); addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeEqualTo(Long value) { public Criteria andCreatedAtIsNull() {
addCriterion("end_time =", value, "endTime"); addCriterion("created_at is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeNotEqualTo(Long value) { public Criteria andCreatedAtIsNotNull() {
addCriterion("end_time <>", value, "endTime"); addCriterion("created_at is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeGreaterThan(Long value) { public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("end_time >", value, "endTime"); addCriterion("created_at =", value, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("end_time >=", value, "endTime"); addCriterion("created_at <>", value, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeLessThan(Long value) { public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("end_time <", value, "endTime"); addCriterion("created_at >", value, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeLessThanOrEqualTo(Long value) { public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("end_time <=", value, "endTime"); addCriterion("created_at >=", value, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeIn(List<Long> values) { public Criteria andCreatedAtLessThan(Date value) {
addCriterion("end_time in", values, "endTime"); addCriterion("created_at <", value, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeNotIn(List<Long> values) { public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("end_time not in", values, "endTime"); addCriterion("created_at <=", value, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeBetween(Long value1, Long value2) { public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("end_time between", value1, value2, "endTime"); addCriterion("created_at in", values, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEndTimeNotBetween(Long value1, Long value2) { public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("end_time not between", value1, value2, "endTime"); addCriterion("created_at not in", values, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIsNull() { public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("remark is null"); addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIsNotNull() { public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("remark is not null"); addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkEqualTo(String value) { public Criteria andUpdatedAtIsNull() {
addCriterion("remark =", value, "remark"); addCriterion("updated_at is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotEqualTo(String value) { public Criteria andUpdatedAtIsNotNull() {
addCriterion("remark <>", value, "remark"); addCriterion("updated_at is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkGreaterThan(String value) { public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("remark >", value, "remark"); addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkGreaterThanOrEqualTo(String value) { public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("remark >=", value, "remark"); addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLessThan(String value) { public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("remark <", value, "remark"); addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLessThanOrEqualTo(String value) { public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("remark <=", value, "remark"); addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLike(String value) { public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("remark like", value, "remark"); addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotLike(String value) { public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("remark not like", value, "remark"); addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIn(List<String> values) { public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("remark in", values, "remark"); addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotIn(List<String> values) { public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("remark not in", values, "remark"); addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkBetween(String value1, String value2) { public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("remark between", value1, value2, "remark"); addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotBetween(String value1, String value2) { public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("remark not between", value1, value2, "remark"); addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverIsNull() { public Criteria andRecStatusIsNull() {
addCriterion("waiver is null"); addCriterion("rec_status is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverIsNotNull() { public Criteria andRecStatusIsNotNull() {
addCriterion("waiver is not null"); addCriterion("rec_status is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverEqualTo(Byte value) { public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("waiver =", value, "waiver"); addCriterion("rec_status =", value, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverNotEqualTo(Byte value) { public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("waiver <>", value, "waiver"); addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverGreaterThan(Byte value) { public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("waiver >", value, "waiver"); addCriterion("rec_status >", value, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverGreaterThanOrEqualTo(Byte value) { public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("waiver >=", value, "waiver"); addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverLessThan(Byte value) { public Criteria andRecStatusLessThan(Byte value) {
addCriterion("waiver <", value, "waiver"); addCriterion("rec_status <", value, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverLessThanOrEqualTo(Byte value) { public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("waiver <=", value, "waiver"); addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverIn(List<Byte> values) { public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("waiver in", values, "waiver"); addCriterion("rec_status in", values, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverNotIn(List<Byte> values) { public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("waiver not in", values, "waiver"); addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverBetween(Byte value1, Byte value2) { public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("waiver between", value1, value2, "waiver"); addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWaiverNotBetween(Byte value1, Byte value2) { public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("waiver not between", value1, value2, "waiver"); addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
} }

2
mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
View File

@ -582,7 +582,7 @@ public class CompeteVo {
@ApiModelProperty("姓名") @ApiModelProperty("姓名")
private String name; private String name;
@ApiModelProperty("场次") @ApiModelProperty("场次")
private Byte competeOrder; private Integer competeOrder;
@ApiModelProperty("场地信息") @ApiModelProperty("场地信息")
private Byte site; private Byte site;
@ApiModelProperty("备注") @ApiModelProperty("备注")

144
mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
View File

@ -101,31 +101,31 @@ public class CompeteTaskService implements ICompeteTaskService {
//有则修改 //有则修改
competeProjectConfig = projectConfigList.get(0); competeProjectConfig = projectConfigList.get(0);
//如果时间、时长、场地数和之前一样则不修改 //如果时间、时长、场地数和之前一样则不修改
if(projectConfig.getStartTime().equals(competeProjectConfig.getStartTime()) && // if(projectConfig.getStartTime().equals(competeProjectConfig.getStartTime()) &&
projectConfig.getEndTime().equals(competeProjectConfig.getEndTime())&& // projectConfig.getEndTime().equals(competeProjectConfig.getEndTime())&&
projectConfig.getDuration().equals(competeProjectConfig.getProjectDuration()) && // projectConfig.getDuration().equals(competeProjectConfig.getProjectDuration()) &&
projectConfig.getSiteNum() == competeProjectConfig.getSiteNum()){ // projectConfig.getSiteNum() == competeProjectConfig.getSiteNum()){
log.info("{},时间与之前相同",projectConfig.getProjectId()); // log.info("{},时间与之前相同",projectConfig.getProjectId());
return; // return;
} // }
//如果场地数量不同，则删除该项目下所有裁判，及tall内的角色 //如果场地数量不同，则删除该项目下所有裁判，及tall内的角色
if(projectConfig.getSiteNum() != competeProjectConfig.getSiteNum()){ // if(projectConfig.getSiteNum() != competeProjectConfig.getSiteNum()){
CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); // CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample();
judgmentExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); // judgmentExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId());
List<CompeteJudgment> judgmentList = competeJudgmentDao.selectByExample(judgmentExample); // List<CompeteJudgment> judgmentList = competeJudgmentDao.selectByExample(judgmentExample);
if(CollectionUtil.isNotEmpty(judgmentList)){ // if(CollectionUtil.isNotEmpty(judgmentList)){
judgmentList.forEach(judgment ->{ // judgmentList.forEach(judgment ->{
judgment.setRecStatus((byte) 2); // judgment.setRecStatus((byte) 2);
competeJudgmentDao.updateByPrimaryKeySelective(judgment); // competeJudgmentDao.updateByPrimaryKeySelective(judgment);
MemberRoleDto.DeleteRole deleteRole = new MemberRoleDto.DeleteRole(); // MemberRoleDto.DeleteRole deleteRole = new MemberRoleDto.DeleteRole();
deleteRole.setRoleId(judgment.getRoleId()); // deleteRole.setRoleId(judgment.getRoleId());
deleteRole.setToken(token); // deleteRole.setToken(token);
log.info("删除角色：{}", judgment.getRoleId()); // log.info("删除角色：{}", judgment.getRoleId());
tallFeignClient.deleteRole(deleteRole); // tallFeignClient.deleteRole(deleteRole);
}); // });
} // }
} // }
competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setProjectDuration(projectConfig.getDuration());
competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum());
competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
@ -186,61 +186,61 @@ public class CompeteTaskService implements ICompeteTaskService {
if (CollectionUtil.isNotEmpty(startOrderList)) { if (CollectionUtil.isNotEmpty(startOrderList)) {
CompeteStartOrder competeStartOrder = startOrderList.get(0); CompeteStartOrder competeStartOrder = startOrderList.get(0);
competeStartOrder.setSite((byte) site); competeStartOrder.setSite((byte) site);
competeStartOrder.setCompeteOrder((byte) competeOrder); competeStartOrder.setCompeteOrder(competeOrder);
// if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) { // if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) {
competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime); competeStartOrder.setEndTime(projectStartTime + orderTime);
log.info("修改场次信息：{}", competeStartOrder); log.info("修改场次信息：{}", competeStartOrder);
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
// 修改tall的任务 // // 修改tall的任务
TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); // TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
updateTaskInfo.setId(competeStartOrder.getTaskId()); // updateTaskInfo.setId(competeStartOrder.getTaskId());
updateTaskInfo.setName(project.getName() + competeOrder + "-" + site); // updateTaskInfo.setName(project.getName() + competeOrder + "-" + site);
updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); // updateTaskInfo.setBeginTime(competeStartOrder.getStartTime());
updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); // updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
updateTaskInfo.setToken(token); // updateTaskInfo.setToken(token);
// TODO // // TODO
log.info("修改tall的任务信息：{}", updateTaskInfo); // log.info("修改tall的任务信息：{}", updateTaskInfo);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); // JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); // log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse);
//失败return // //失败return
if (ObjectUtil.isNull(normalTaskJsonResponse)) { // if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null"); // log.info("调用tall返回null");
taskErrorList.add("修改任务失败"+competeStartOrder.getTaskId()); // taskErrorList.add("修改任务失败"+competeStartOrder.getTaskId());
} // }
if(normalTaskJsonResponse.getCode() != 200){ // if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); // log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
taskErrorList.add(normalTaskJsonResponse.getMsg()+competeStartOrder.getTaskId()); // taskErrorList.add(normalTaskJsonResponse.getMsg()+competeStartOrder.getTaskId());
} // }
// } // }
} else { } else {
//添加tall的任务 // //添加tall的任务
Long taskId = null; // Long taskId = null;
TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); // TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
addTask.setProjectId(tallProjectId); // addTask.setProjectId(tallProjectId);
addTask.setTaskName(project.getName() + competeOrder + "-" + site); // addTask.setTaskName(project.getName() + competeOrder + "-" + site);
addTask.setBeginTime(projectStartTime); // addTask.setBeginTime(projectStartTime);
addTask.setEndTime(projectStartTime + orderTime); // addTask.setEndTime(projectStartTime + orderTime);
addTask.setExecutorId(tallRoleId); // addTask.setExecutorId(tallRoleId);
addTask.setToken(token); // addTask.setToken(token);
// TODO // // TODO
log.info("在tall内添加任务：{}", addTask); // log.info("在tall内添加任务：{}", addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); // JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
//异常return // //异常return
log.info("添加任务后返回：{}", normalTaskJsonResponse); // log.info("添加任务后返回：{}", normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse)) { // if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null"); // log.info("调用tall返回null");
continue; // continue;
} // }
if(normalTaskJsonResponse.getCode() != 200){ // if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); // log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
continue; // continue;
} // }
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); // TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
if (ObjectUtil.isNotNull(normalTask)) { // if (ObjectUtil.isNotNull(normalTask)) {
taskId = normalTask.getDetailId(); // taskId = normalTask.getDetailId();
} // }
//添加出场顺序信息 //添加出场顺序信息
CompeteStartOrder competeStartOrder = new CompeteStartOrder(); CompeteStartOrder competeStartOrder = new CompeteStartOrder();
competeStartOrder.setId(snowflake.nextId()); competeStartOrder.setId(snowflake.nextId());
@ -248,8 +248,8 @@ public class CompeteTaskService implements ICompeteTaskService {
competeStartOrder.setPlayerId(playerIdOrTeamId); competeStartOrder.setPlayerId(playerIdOrTeamId);
competeStartOrder.setSite((byte) site); competeStartOrder.setSite((byte) site);
competeStartOrder.setTeam(project.getTeam()); competeStartOrder.setTeam(project.getTeam());
competeStartOrder.setCompeteOrder((byte) competeOrder); competeStartOrder.setCompeteOrder(competeOrder);
competeStartOrder.setTaskId(taskId); // competeStartOrder.setTaskId(taskId);
competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime); competeStartOrder.setEndTime(projectStartTime + orderTime);
log.info("添加场次信息：{}", competeStartOrder); log.info("添加场次信息：{}", competeStartOrder);

4
mt/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: prod active: dev
include: common, util-prod include: common, util-dev

20
mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
View File

@ -75,15 +75,15 @@
pp.id pp.id
FROM FROM
t_compete_project_player pp t_compete_project_player pp
LEFT JOIN t_compete_player p on pp.player_id = p.id LEFT JOIN t_compete_player p on pp.player_id = p.id and p.rec_status = 0
LEFT JOIN t_compete_group g on p.compete_group_id = g.id LEFT JOIN t_compete_group g on p.compete_group_id = g.id and g.rec_status = 0 and g.type = 5
LEFT JOIN t_compete_company c on p.company_id = c.id LEFT JOIN t_compete_company c on p.company_id = c.id and c.rec_status = 0
WHERE WHERE
pp.project_id = #{projectId} pp.project_id = #{projectId}
and pp.rec_status = 0 and pp.rec_status = 0
and p.rec_status = 0
and g.rec_status = 0
and c.rec_status = 0
ORDER BY g.id ORDER BY g.id
</if> </if>
<if test="team == 1"> <if test="team == 1">
@ -91,13 +91,13 @@
t.id t.id
FROM FROM
t_compete_team t t_compete_team t
LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex and g.rec_status = 0 and g.type = 5
LEFT JOIN t_compete_company c on t.company_id = c.id LEFT JOIN t_compete_company c on t.company_id = c.id and c.rec_status = 0
WHERE WHERE
t.project_id = #{projectId} t.project_id = #{projectId}
and t.rec_status = 0 and t.rec_status = 0
and g.rec_status = 0
and c.rec_status = 0
ORDER BY g.id ORDER BY g.id
</if> </if>
</select> </select>

33
mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
View File

@ -1708,26 +1708,29 @@ ORDER BY
v.video_url as videoUrl v.video_url as videoUrl
FROM FROM
t_compete_project p t_compete_project p
LEFT JOIN t_compete_team t ON p.id = t.project_id LEFT JOIN t_compete_team t ON p.id = t.project_id
LEFT JOIN t_compete_team_member m ON t.id = m.compete_team_id and t.rec_status = 0
LEFT JOIN t_compete_company c ON t.company_id = c.id LEFT JOIN t_compete_team_member m ON t.id = m.compete_team_id
LEFT JOIN t_compete_player pl ON m.player_id = pl.id and m.rec_status = 0
LEFT JOIN t_compete_group g ON t.gender_group = g.sex LEFT JOIN t_compete_company c ON t.company_id = c.id
AND t.group_remark = g.group_remark and c.rec_status = 0
LEFT JOIN t_compete_project_config pc ON pc.project_id = p.id LEFT JOIN t_compete_player pl ON m.player_id = pl.id
LEFT JOIN t_compete_start_order so ON t.id = so.player_id and pl.rec_status = 0
LEFT JOIN t_compete_video v on v.player_id = t.id and v.rec_status = 0 LEFT JOIN t_compete_group g ON t.gender_group = g.sex
AND t.group_remark = g.group_remark AND g.rec_status = 0
and g.type = #{type}
LEFT JOIN t_compete_project_config pc ON pc.project_id = p.id
AND pc.rec_status = 0
LEFT JOIN t_compete_start_order so ON t.id = so.player_id
AND so.rec_status = 0
LEFT JOIN t_compete_video v ON v.player_id = t.id
AND v.rec_status = 0
WHERE WHERE
p.type = #{type} p.type = #{type}
AND p.`level` = 2 AND p.`level` = 2
AND p.team = 1 AND p.team = 1
AND p.rec_status = 0 AND p.rec_status = 0
AND m.rec_status = 0
AND t.rec_status = 0
AND pl.rec_status = 0
AND g.rec_status = 0
AND c.rec_status = 0
AND pc.rec_status = 0
AND so.rec_status = 0 AND so.rec_status = 0
GROUP BY GROUP BY
c.id, c.id,

138
mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml
View File

@ -6,16 +6,16 @@
<result column="project_id" jdbcType="BIGINT" property="projectId" /> <result column="project_id" jdbcType="BIGINT" property="projectId" />
<result column="player_id" jdbcType="BIGINT" property="playerId" /> <result column="player_id" jdbcType="BIGINT" property="playerId" />
<result column="team" jdbcType="TINYINT" property="team" /> <result column="team" jdbcType="TINYINT" property="team" />
<result column="compete_order" jdbcType="TINYINT" property="competeOrder" /> <result column="compete_order" jdbcType="INTEGER" property="competeOrder" />
<result column="site" jdbcType="TINYINT" property="site" /> <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" />
<result column="task_id" jdbcType="BIGINT" property="taskId" /> <result column="task_id" jdbcType="BIGINT" property="taskId" />
<result column="start_time" jdbcType="BIGINT" property="startTime" /> <result column="start_time" jdbcType="BIGINT" property="startTime" />
<result column="end_time" jdbcType="BIGINT" property="endTime" /> <result column="end_time" jdbcType="BIGINT" property="endTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="waiver" jdbcType="TINYINT" property="waiver" /> <result column="waiver" jdbcType="TINYINT" property="waiver" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<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> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -76,8 +76,8 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status, id, project_id, player_id, team, compete_order, site, task_id, start_time, end_time,
task_id, start_time, end_time, remark, waiver waiver, remark, created_at, updated_at, rec_status
</sql> </sql>
<select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample" resultMap="BaseResultMap">
select select
@ -112,14 +112,14 @@
<insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder"> <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
insert into t_compete_start_order (id, project_id, player_id, insert into t_compete_start_order (id, project_id, player_id,
team, compete_order, site, team, compete_order, site,
created_at, updated_at, rec_status,
task_id, start_time, end_time, task_id, start_time, end_time,
remark, waiver) waiver, remark, created_at,
updated_at, rec_status)
values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT},
#{team,jdbcType=TINYINT}, #{competeOrder,jdbcType=TINYINT}, #{site,jdbcType=TINYINT}, #{team,jdbcType=TINYINT}, #{competeOrder,jdbcType=INTEGER}, #{site,jdbcType=TINYINT},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT},
#{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT},
#{remark,jdbcType=VARCHAR}, #{waiver,jdbcType=TINYINT}) #{waiver,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder"> <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
insert into t_compete_start_order insert into t_compete_start_order
@ -142,15 +142,6 @@
<if test="site != null"> <if test="site != null">
site, site,
</if> </if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
<if test="taskId != null"> <if test="taskId != null">
task_id, task_id,
</if> </if>
@ -160,11 +151,20 @@
<if test="endTime != null"> <if test="endTime != null">
end_time, end_time,
</if> </if>
<if test="waiver != null">
waiver,
</if>
<if test="remark != null"> <if test="remark != null">
remark, remark,
</if> </if>
<if test="waiver != null"> <if test="createdAt != null">
waiver, created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@ -181,20 +181,11 @@
#{team,jdbcType=TINYINT}, #{team,jdbcType=TINYINT},
</if> </if>
<if test="competeOrder != null"> <if test="competeOrder != null">
#{competeOrder,jdbcType=TINYINT}, #{competeOrder,jdbcType=INTEGER},
</if> </if>
<if test="site != null"> <if test="site != null">
#{site,jdbcType=TINYINT}, #{site,jdbcType=TINYINT},
</if> </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>
<if test="taskId != null"> <if test="taskId != null">
#{taskId,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT},
</if> </if>
@ -204,11 +195,20 @@
<if test="endTime != null"> <if test="endTime != null">
#{endTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT},
</if> </if>
<if test="waiver != null">
#{waiver,jdbcType=TINYINT},
</if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="waiver != null"> <if test="createdAt != null">
#{waiver,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if> </if>
</trim> </trim>
</insert> </insert>
@ -234,20 +234,11 @@
team = #{record.team,jdbcType=TINYINT}, team = #{record.team,jdbcType=TINYINT},
</if> </if>
<if test="record.competeOrder != null"> <if test="record.competeOrder != null">
compete_order = #{record.competeOrder,jdbcType=TINYINT}, compete_order = #{record.competeOrder,jdbcType=INTEGER},
</if> </if>
<if test="record.site != null"> <if test="record.site != null">
site = #{record.site,jdbcType=TINYINT}, site = #{record.site,jdbcType=TINYINT},
</if> </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>
<if test="record.taskId != null"> <if test="record.taskId != null">
task_id = #{record.taskId,jdbcType=BIGINT}, task_id = #{record.taskId,jdbcType=BIGINT},
</if> </if>
@ -257,11 +248,20 @@
<if test="record.endTime != null"> <if test="record.endTime != null">
end_time = #{record.endTime,jdbcType=BIGINT}, end_time = #{record.endTime,jdbcType=BIGINT},
</if> </if>
<if test="record.waiver != null">
waiver = #{record.waiver,jdbcType=TINYINT},
</if>
<if test="record.remark != null"> <if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.waiver != null"> <if test="record.createdAt != null">
waiver = #{record.waiver,jdbcType=TINYINT}, 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> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@ -274,16 +274,16 @@
project_id = #{record.projectId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT},
player_id = #{record.playerId,jdbcType=BIGINT}, player_id = #{record.playerId,jdbcType=BIGINT},
team = #{record.team,jdbcType=TINYINT}, team = #{record.team,jdbcType=TINYINT},
compete_order = #{record.competeOrder,jdbcType=TINYINT}, compete_order = #{record.competeOrder,jdbcType=INTEGER},
site = #{record.site,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},
task_id = #{record.taskId,jdbcType=BIGINT}, task_id = #{record.taskId,jdbcType=BIGINT},
start_time = #{record.startTime,jdbcType=BIGINT}, start_time = #{record.startTime,jdbcType=BIGINT},
end_time = #{record.endTime,jdbcType=BIGINT}, end_time = #{record.endTime,jdbcType=BIGINT},
waiver = #{record.waiver,jdbcType=TINYINT},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
waiver = #{record.waiver,jdbcType=TINYINT} created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -301,20 +301,11 @@
team = #{team,jdbcType=TINYINT}, team = #{team,jdbcType=TINYINT},
</if> </if>
<if test="competeOrder != null"> <if test="competeOrder != null">
compete_order = #{competeOrder,jdbcType=TINYINT}, compete_order = #{competeOrder,jdbcType=INTEGER},
</if> </if>
<if test="site != null"> <if test="site != null">
site = #{site,jdbcType=TINYINT}, site = #{site,jdbcType=TINYINT},
</if> </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>
<if test="taskId != null"> <if test="taskId != null">
task_id = #{taskId,jdbcType=BIGINT}, task_id = #{taskId,jdbcType=BIGINT},
</if> </if>
@ -324,11 +315,20 @@
<if test="endTime != null"> <if test="endTime != null">
end_time = #{endTime,jdbcType=BIGINT}, end_time = #{endTime,jdbcType=BIGINT},
</if> </if>
<if test="waiver != null">
waiver = #{waiver,jdbcType=TINYINT},
</if>
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="waiver != null"> <if test="createdAt != null">
waiver = #{waiver,jdbcType=TINYINT}, 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> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
@ -338,16 +338,16 @@
set project_id = #{projectId,jdbcType=BIGINT}, set project_id = #{projectId,jdbcType=BIGINT},
player_id = #{playerId,jdbcType=BIGINT}, player_id = #{playerId,jdbcType=BIGINT},
team = #{team,jdbcType=TINYINT}, team = #{team,jdbcType=TINYINT},
compete_order = #{competeOrder,jdbcType=TINYINT}, compete_order = #{competeOrder,jdbcType=INTEGER},
site = #{site,jdbcType=TINYINT}, site = #{site,jdbcType=TINYINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
task_id = #{taskId,jdbcType=BIGINT}, task_id = #{taskId,jdbcType=BIGINT},
start_time = #{startTime,jdbcType=BIGINT}, start_time = #{startTime,jdbcType=BIGINT},
end_time = #{endTime,jdbcType=BIGINT}, end_time = #{endTime,jdbcType=BIGINT},
waiver = #{waiver,jdbcType=TINYINT},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
waiver = #{waiver,jdbcType=TINYINT} created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save