diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java index a6facb50..b2bc38f8 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -12,25 +12,25 @@ public class CompeteStartOrder implements Serializable { private Byte team; - private Byte competeOrder; + private Integer competeOrder; private Byte site; - private Date createdAt; - - private Date updatedAt; - - private Byte recStatus; - private Long taskId; private Long startTime; private Long endTime; + private Byte waiver; + private String remark; - private Byte waiver; + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; private static final long serialVersionUID = 1L; @@ -66,11 +66,11 @@ public class CompeteStartOrder implements Serializable { this.team = team; } - public Byte getCompeteOrder() { + public Integer getCompeteOrder() { return competeOrder; } - public void setCompeteOrder(Byte competeOrder) { + public void setCompeteOrder(Integer competeOrder) { this.competeOrder = competeOrder; } @@ -82,30 +82,6 @@ public class CompeteStartOrder implements Serializable { 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() { return taskId; } @@ -130,6 +106,14 @@ public class CompeteStartOrder implements Serializable { this.endTime = endTime; } + public Byte getWaiver() { + return waiver; + } + + public void setWaiver(Byte waiver) { + this.waiver = waiver; + } + public String getRemark() { return remark; } @@ -138,12 +122,28 @@ public class CompeteStartOrder implements Serializable { this.remark = remark == null ? null : remark.trim(); } - public Byte getWaiver() { - return waiver; + public Date getCreatedAt() { + return createdAt; } - public void setWaiver(Byte waiver) { - this.waiver = waiver; + 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 @@ -158,14 +158,14 @@ public class CompeteStartOrder implements Serializable { sb.append(", team=").append(team); 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(", taskId=").append(taskId); sb.append(", startTime=").append(startTime); sb.append(", endTime=").append(endTime); - sb.append(", remark=").append(remark); 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("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java index a0ba3036..344192de 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java @@ -355,52 +355,52 @@ public class CompeteStartOrderExample { return (Criteria) this; } - public Criteria andCompeteOrderEqualTo(Byte value) { + public Criteria andCompeteOrderEqualTo(Integer value) { addCriterion("compete_order =", value, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderNotEqualTo(Byte value) { + public Criteria andCompeteOrderNotEqualTo(Integer value) { addCriterion("compete_order <>", value, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderGreaterThan(Byte value) { + public Criteria andCompeteOrderGreaterThan(Integer value) { addCriterion("compete_order >", value, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderGreaterThanOrEqualTo(Byte value) { + public Criteria andCompeteOrderGreaterThanOrEqualTo(Integer value) { addCriterion("compete_order >=", value, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderLessThan(Byte value) { + public Criteria andCompeteOrderLessThan(Integer value) { addCriterion("compete_order <", value, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderLessThanOrEqualTo(Byte value) { + public Criteria andCompeteOrderLessThanOrEqualTo(Integer value) { addCriterion("compete_order <=", value, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderIn(List values) { + public Criteria andCompeteOrderIn(List values) { addCriterion("compete_order in", values, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderNotIn(List values) { + public Criteria andCompeteOrderNotIn(List values) { addCriterion("compete_order not in", values, "competeOrder"); return (Criteria) this; } - public Criteria andCompeteOrderBetween(Byte value1, Byte value2) { + public Criteria andCompeteOrderBetween(Integer value1, Integer value2) { addCriterion("compete_order between", value1, value2, "competeOrder"); 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"); return (Criteria) this; } @@ -465,493 +465,493 @@ public class CompeteStartOrderExample { return (Criteria) this; } - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); + public Criteria andTaskIdIsNull() { + addCriterion("task_id is null"); return (Criteria) this; } - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); + public Criteria andTaskIdIsNotNull() { + addCriterion("task_id is not null"); return (Criteria) this; } - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); + public Criteria andTaskIdEqualTo(Long value) { + addCriterion("task_id =", value, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); + public Criteria andTaskIdNotEqualTo(Long value) { + addCriterion("task_id <>", value, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); + public Criteria andTaskIdGreaterThan(Long value) { + addCriterion("task_id >", value, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); + public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_id >=", value, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); + public Criteria andTaskIdLessThan(Long value) { + addCriterion("task_id <", value, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); + public Criteria andTaskIdLessThanOrEqualTo(Long value) { + addCriterion("task_id <=", value, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); + public Criteria andTaskIdIn(List values) { + addCriterion("task_id in", values, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); + public Criteria andTaskIdNotIn(List values) { + addCriterion("task_id not in", values, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); + public Criteria andTaskIdBetween(Long value1, Long value2) { + addCriterion("task_id between", value1, value2, "taskId"); return (Criteria) this; } - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); + public Criteria andTaskIdNotBetween(Long value1, Long value2) { + addCriterion("task_id not between", value1, value2, "taskId"); return (Criteria) this; } - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); + public Criteria andStartTimeIsNull() { + addCriterion("start_time is null"); return (Criteria) this; } - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); + public Criteria andStartTimeIsNotNull() { + addCriterion("start_time is not null"); return (Criteria) this; } - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); + public Criteria andStartTimeEqualTo(Long value) { + addCriterion("start_time =", value, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); + public Criteria andStartTimeNotEqualTo(Long value) { + addCriterion("start_time <>", value, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); + public Criteria andStartTimeGreaterThan(Long value) { + addCriterion("start_time >", value, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); + public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { + addCriterion("start_time >=", value, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); + public Criteria andStartTimeLessThan(Long value) { + addCriterion("start_time <", value, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); + public Criteria andStartTimeLessThanOrEqualTo(Long value) { + addCriterion("start_time <=", value, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); + public Criteria andStartTimeIn(List values) { + addCriterion("start_time in", values, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); + public Criteria andStartTimeNotIn(List values) { + addCriterion("start_time not in", values, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); + public Criteria andStartTimeBetween(Long value1, Long value2) { + addCriterion("start_time between", value1, value2, "startTime"); return (Criteria) this; } - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); + public Criteria andStartTimeNotBetween(Long value1, Long value2) { + addCriterion("start_time not between", value1, value2, "startTime"); return (Criteria) this; } - public Criteria andRecStatusIsNull() { - addCriterion("rec_status is null"); + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); return (Criteria) this; } - public Criteria andRecStatusIsNotNull() { - addCriterion("rec_status is not null"); + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); return (Criteria) this; } - public Criteria andRecStatusEqualTo(Byte value) { - addCriterion("rec_status =", value, "recStatus"); + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); return (Criteria) this; } - public Criteria andRecStatusNotEqualTo(Byte value) { - addCriterion("rec_status <>", value, "recStatus"); + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); return (Criteria) this; } - public Criteria andRecStatusGreaterThan(Byte value) { - addCriterion("rec_status >", value, "recStatus"); + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); return (Criteria) this; } - public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("rec_status >=", value, "recStatus"); + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); return (Criteria) this; } - public Criteria andRecStatusLessThan(Byte value) { - addCriterion("rec_status <", value, "recStatus"); + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); return (Criteria) this; } - public Criteria andRecStatusLessThanOrEqualTo(Byte value) { - addCriterion("rec_status <=", value, "recStatus"); + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); return (Criteria) this; } - public Criteria andRecStatusIn(List values) { - addCriterion("rec_status in", values, "recStatus"); + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); return (Criteria) this; } - public Criteria andRecStatusNotIn(List values) { - addCriterion("rec_status not in", values, "recStatus"); + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); return (Criteria) this; } - public Criteria andRecStatusBetween(Byte value1, Byte value2) { - addCriterion("rec_status between", value1, value2, "recStatus"); + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); return (Criteria) this; } - public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { - addCriterion("rec_status not between", value1, value2, "recStatus"); + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); return (Criteria) this; } - public Criteria andTaskIdIsNull() { - addCriterion("task_id is null"); + public Criteria andWaiverIsNull() { + addCriterion("waiver is null"); return (Criteria) this; } - public Criteria andTaskIdIsNotNull() { - addCriterion("task_id is not null"); + public Criteria andWaiverIsNotNull() { + addCriterion("waiver is not null"); return (Criteria) this; } - public Criteria andTaskIdEqualTo(Long value) { - addCriterion("task_id =", value, "taskId"); + public Criteria andWaiverEqualTo(Byte value) { + addCriterion("waiver =", value, "waiver"); return (Criteria) this; } - public Criteria andTaskIdNotEqualTo(Long value) { - addCriterion("task_id <>", value, "taskId"); + public Criteria andWaiverNotEqualTo(Byte value) { + addCriterion("waiver <>", value, "waiver"); return (Criteria) this; } - public Criteria andTaskIdGreaterThan(Long value) { - addCriterion("task_id >", value, "taskId"); + public Criteria andWaiverGreaterThan(Byte value) { + addCriterion("waiver >", value, "waiver"); return (Criteria) this; } - public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { - addCriterion("task_id >=", value, "taskId"); + public Criteria andWaiverGreaterThanOrEqualTo(Byte value) { + addCriterion("waiver >=", value, "waiver"); return (Criteria) this; } - public Criteria andTaskIdLessThan(Long value) { - addCriterion("task_id <", value, "taskId"); + public Criteria andWaiverLessThan(Byte value) { + addCriterion("waiver <", value, "waiver"); return (Criteria) this; } - public Criteria andTaskIdLessThanOrEqualTo(Long value) { - addCriterion("task_id <=", value, "taskId"); + public Criteria andWaiverLessThanOrEqualTo(Byte value) { + addCriterion("waiver <=", value, "waiver"); return (Criteria) this; } - public Criteria andTaskIdIn(List values) { - addCriterion("task_id in", values, "taskId"); + public Criteria andWaiverIn(List values) { + addCriterion("waiver in", values, "waiver"); return (Criteria) this; } - public Criteria andTaskIdNotIn(List values) { - addCriterion("task_id not in", values, "taskId"); + public Criteria andWaiverNotIn(List values) { + addCriterion("waiver not in", values, "waiver"); return (Criteria) this; } - public Criteria andTaskIdBetween(Long value1, Long value2) { - addCriterion("task_id between", value1, value2, "taskId"); + public Criteria andWaiverBetween(Byte value1, Byte value2) { + addCriterion("waiver between", value1, value2, "waiver"); return (Criteria) this; } - public Criteria andTaskIdNotBetween(Long value1, Long value2) { - addCriterion("task_id not between", value1, value2, "taskId"); + public Criteria andWaiverNotBetween(Byte value1, Byte value2) { + addCriterion("waiver not between", value1, value2, "waiver"); return (Criteria) this; } - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); return (Criteria) this; } - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); return (Criteria) this; } - public Criteria andStartTimeEqualTo(Long value) { - addCriterion("start_time =", value, "startTime"); + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeNotEqualTo(Long value) { - addCriterion("start_time <>", value, "startTime"); + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeGreaterThan(Long value) { - addCriterion("start_time >", value, "startTime"); + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { - addCriterion("start_time >=", value, "startTime"); + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeLessThan(Long value) { - addCriterion("start_time <", value, "startTime"); + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeLessThanOrEqualTo(Long value) { - addCriterion("start_time <=", value, "startTime"); + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); return (Criteria) this; } - public Criteria andStartTimeBetween(Long value1, Long value2) { - addCriterion("start_time between", value1, value2, "startTime"); + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); return (Criteria) this; } - public Criteria andStartTimeNotBetween(Long value1, Long value2) { - addCriterion("start_time not between", value1, value2, "startTime"); + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); return (Criteria) this; } - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } - public Criteria andEndTimeEqualTo(Long value) { - addCriterion("end_time =", value, "endTime"); + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); return (Criteria) this; } - public Criteria andEndTimeNotEqualTo(Long value) { - addCriterion("end_time <>", value, "endTime"); + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); return (Criteria) this; } - public Criteria andEndTimeGreaterThan(Long value) { - addCriterion("end_time >", value, "endTime"); + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { - addCriterion("end_time >=", value, "endTime"); + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeLessThan(Long value) { - addCriterion("end_time <", value, "endTime"); + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeLessThanOrEqualTo(Long value) { - addCriterion("end_time <=", value, "endTime"); + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeBetween(Long value1, Long value2) { - addCriterion("end_time between", value1, value2, "endTime"); + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); return (Criteria) this; } - public Criteria andEndTimeNotBetween(Long value1, Long value2) { - addCriterion("end_time not between", value1, value2, "endTime"); + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); return (Criteria) this; } - public Criteria andRemarkIsNull() { - addCriterion("remark is null"); + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); return (Criteria) this; } - public Criteria andRemarkIsNotNull() { - addCriterion("remark is not null"); + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); return (Criteria) this; } - public Criteria andRemarkEqualTo(String value) { - addCriterion("remark =", value, "remark"); + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); return (Criteria) this; } - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("remark <>", value, "remark"); + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); return (Criteria) this; } - public Criteria andRemarkGreaterThan(String value) { - addCriterion("remark >", value, "remark"); + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("remark >=", value, "remark"); + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkLessThan(String value) { - addCriterion("remark <", value, "remark"); + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("remark <=", value, "remark"); + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkLike(String value) { - addCriterion("remark like", value, "remark"); + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkNotLike(String value) { - addCriterion("remark not like", value, "remark"); + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkIn(List values) { - addCriterion("remark in", values, "remark"); + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkNotIn(List values) { - addCriterion("remark not in", values, "remark"); + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("remark between", value1, value2, "remark"); + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); return (Criteria) this; } - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("remark not between", value1, value2, "remark"); + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); return (Criteria) this; } - public Criteria andWaiverIsNull() { - addCriterion("waiver is null"); + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); return (Criteria) this; } - public Criteria andWaiverIsNotNull() { - addCriterion("waiver is not null"); + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); return (Criteria) this; } - public Criteria andWaiverEqualTo(Byte value) { - addCriterion("waiver =", value, "waiver"); + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); return (Criteria) this; } - public Criteria andWaiverNotEqualTo(Byte value) { - addCriterion("waiver <>", value, "waiver"); + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); return (Criteria) this; } - public Criteria andWaiverGreaterThan(Byte value) { - addCriterion("waiver >", value, "waiver"); + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); return (Criteria) this; } - public Criteria andWaiverGreaterThanOrEqualTo(Byte value) { - addCriterion("waiver >=", value, "waiver"); + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); return (Criteria) this; } - public Criteria andWaiverLessThan(Byte value) { - addCriterion("waiver <", value, "waiver"); + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); return (Criteria) this; } - public Criteria andWaiverLessThanOrEqualTo(Byte value) { - addCriterion("waiver <=", value, "waiver"); + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); return (Criteria) this; } - public Criteria andWaiverIn(List values) { - addCriterion("waiver in", values, "waiver"); + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); return (Criteria) this; } - public Criteria andWaiverNotIn(List values) { - addCriterion("waiver not in", values, "waiver"); + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); return (Criteria) this; } - public Criteria andWaiverBetween(Byte value1, Byte value2) { - addCriterion("waiver between", value1, value2, "waiver"); + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); return (Criteria) this; } - public Criteria andWaiverNotBetween(Byte value1, Byte value2) { - addCriterion("waiver not between", value1, value2, "waiver"); + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index e3f0f0b3..fbafef74 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -582,7 +582,7 @@ public class CompeteVo { @ApiModelProperty("姓名") private String name; @ApiModelProperty("场次") - private Byte competeOrder; + private Integer competeOrder; @ApiModelProperty("场地信息") private Byte site; @ApiModelProperty("备注") diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index be461a9a..bd0f9002 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -101,31 +101,31 @@ public class CompeteTaskService implements ICompeteTaskService { //有则修改 competeProjectConfig = projectConfigList.get(0); //如果时间、时长、场地数和之前一样则不修改 - if(projectConfig.getStartTime().equals(competeProjectConfig.getStartTime()) && - projectConfig.getEndTime().equals(competeProjectConfig.getEndTime())&& - projectConfig.getDuration().equals(competeProjectConfig.getProjectDuration()) && - projectConfig.getSiteNum() == competeProjectConfig.getSiteNum()){ - log.info("{},时间与之前相同",projectConfig.getProjectId()); - return; - } +// if(projectConfig.getStartTime().equals(competeProjectConfig.getStartTime()) && +// projectConfig.getEndTime().equals(competeProjectConfig.getEndTime())&& +// projectConfig.getDuration().equals(competeProjectConfig.getProjectDuration()) && +// projectConfig.getSiteNum() == competeProjectConfig.getSiteNum()){ +// log.info("{},时间与之前相同",projectConfig.getProjectId()); +// return; +// } //如果场地数量不同，则删除该项目下所有裁判，及tall内的角色 - if(projectConfig.getSiteNum() != competeProjectConfig.getSiteNum()){ - CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); - judgmentExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); - List judgmentList = competeJudgmentDao.selectByExample(judgmentExample); - if(CollectionUtil.isNotEmpty(judgmentList)){ - judgmentList.forEach(judgment ->{ - judgment.setRecStatus((byte) 2); - competeJudgmentDao.updateByPrimaryKeySelective(judgment); +// if(projectConfig.getSiteNum() != competeProjectConfig.getSiteNum()){ +// CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); +// judgmentExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); +// List judgmentList = competeJudgmentDao.selectByExample(judgmentExample); +// if(CollectionUtil.isNotEmpty(judgmentList)){ +// judgmentList.forEach(judgment ->{ +// judgment.setRecStatus((byte) 2); +// competeJudgmentDao.updateByPrimaryKeySelective(judgment); - MemberRoleDto.DeleteRole deleteRole = new MemberRoleDto.DeleteRole(); - deleteRole.setRoleId(judgment.getRoleId()); - deleteRole.setToken(token); - log.info("删除角色：{}", judgment.getRoleId()); - tallFeignClient.deleteRole(deleteRole); - }); - } - } +// MemberRoleDto.DeleteRole deleteRole = new MemberRoleDto.DeleteRole(); +// deleteRole.setRoleId(judgment.getRoleId()); +// deleteRole.setToken(token); +// log.info("删除角色：{}", judgment.getRoleId()); +// tallFeignClient.deleteRole(deleteRole); +// }); +// } +// } competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); @@ -186,61 +186,61 @@ public class CompeteTaskService implements ICompeteTaskService { if (CollectionUtil.isNotEmpty(startOrderList)) { CompeteStartOrder competeStartOrder = startOrderList.get(0); competeStartOrder.setSite((byte) site); - competeStartOrder.setCompeteOrder((byte) competeOrder); + competeStartOrder.setCompeteOrder(competeOrder); // if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) { competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); log.info("修改场次信息：{}", competeStartOrder); startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); - // 修改tall的任务 - TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); - updateTaskInfo.setId(competeStartOrder.getTaskId()); - updateTaskInfo.setName(project.getName() + competeOrder + "-" + site); - updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); - updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); - updateTaskInfo.setToken(token); - // TODO - log.info("修改tall的任务信息：{}", updateTaskInfo); - JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); - log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); - //失败return - if (ObjectUtil.isNull(normalTaskJsonResponse)) { - log.info("调用tall返回null"); - taskErrorList.add("修改任务失败"+competeStartOrder.getTaskId()); - } - if(normalTaskJsonResponse.getCode() != 200){ - log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); - taskErrorList.add(normalTaskJsonResponse.getMsg()+competeStartOrder.getTaskId()); - } +// // 修改tall的任务 +// TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); +// updateTaskInfo.setId(competeStartOrder.getTaskId()); +// updateTaskInfo.setName(project.getName() + competeOrder + "-" + site); +// updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); +// updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); +// updateTaskInfo.setToken(token); +// // TODO +// log.info("修改tall的任务信息：{}", updateTaskInfo); +// JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); +// log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); +// //失败return +// if (ObjectUtil.isNull(normalTaskJsonResponse)) { +// log.info("调用tall返回null"); +// taskErrorList.add("修改任务失败"+competeStartOrder.getTaskId()); +// } +// if(normalTaskJsonResponse.getCode() != 200){ +// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); +// taskErrorList.add(normalTaskJsonResponse.getMsg()+competeStartOrder.getTaskId()); +// } // } } else { - //添加tall的任务 - Long taskId = null; - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + competeOrder + "-" + site); - addTask.setBeginTime(projectStartTime); - addTask.setEndTime(projectStartTime + orderTime); - addTask.setExecutorId(tallRoleId); - addTask.setToken(token); - // TODO - log.info("在tall内添加任务：{}", addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - //异常return - log.info("添加任务后返回：{}", normalTaskJsonResponse); - if (ObjectUtil.isNull(normalTaskJsonResponse)) { - log.info("调用tall返回null"); - continue; - } - if(normalTaskJsonResponse.getCode() != 200){ - log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); - continue; - } - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - taskId = normalTask.getDetailId(); - } +// //添加tall的任务 +// Long taskId = null; +// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); +// addTask.setProjectId(tallProjectId); +// addTask.setTaskName(project.getName() + competeOrder + "-" + site); +// addTask.setBeginTime(projectStartTime); +// addTask.setEndTime(projectStartTime + orderTime); +// addTask.setExecutorId(tallRoleId); +// addTask.setToken(token); +// // TODO +// log.info("在tall内添加任务：{}", addTask); +// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); +// //异常return +// log.info("添加任务后返回：{}", normalTaskJsonResponse); +// if (ObjectUtil.isNull(normalTaskJsonResponse)) { +// log.info("调用tall返回null"); +// continue; +// } +// if(normalTaskJsonResponse.getCode() != 200){ +// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); +// continue; +// } +// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); +// if (ObjectUtil.isNotNull(normalTask)) { +// taskId = normalTask.getDetailId(); +// } //添加出场顺序信息 CompeteStartOrder competeStartOrder = new CompeteStartOrder(); competeStartOrder.setId(snowflake.nextId()); @@ -248,8 +248,8 @@ public class CompeteTaskService implements ICompeteTaskService { competeStartOrder.setPlayerId(playerIdOrTeamId); competeStartOrder.setSite((byte) site); competeStartOrder.setTeam(project.getTeam()); - competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); + competeStartOrder.setCompeteOrder(competeOrder); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); log.info("添加场次信息：{}", competeStartOrder); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml index d12f3f1c..4ad00116 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml @@ -75,15 +75,15 @@ pp.id FROM t_compete_project_player pp - LEFT JOIN t_compete_player p on pp.player_id = p.id - LEFT JOIN t_compete_group g on p.compete_group_id = g.id - LEFT JOIN t_compete_company c on p.company_id = c.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 and g.rec_status = 0 and g.type = 5 + LEFT JOIN t_compete_company c on p.company_id = c.id and c.rec_status = 0 WHERE pp.project_id = #{projectId} and pp.rec_status = 0 - and p.rec_status = 0 - and g.rec_status = 0 - and c.rec_status = 0 + + + ORDER BY g.id @@ -91,13 +91,13 @@ t.id FROM 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_company c on t.company_id = c.id + 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 and c.rec_status = 0 WHERE t.project_id = #{projectId} and t.rec_status = 0 - and g.rec_status = 0 - and c.rec_status = 0 + + ORDER BY g.id diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 52fa195c..af29e21d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -1708,26 +1708,29 @@ ORDER BY v.video_url as videoUrl FROM t_compete_project p - 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 - LEFT JOIN t_compete_company c ON t.company_id = c.id - LEFT JOIN t_compete_player pl ON m.player_id = pl.id - LEFT JOIN t_compete_group g ON t.gender_group = g.sex - AND t.group_remark = g.group_remark - LEFT JOIN t_compete_project_config pc ON pc.project_id = p.id - LEFT JOIN t_compete_start_order so ON t.id = so.player_id - LEFT JOIN t_compete_video v on v.player_id = t.id and v.rec_status = 0 + LEFT JOIN t_compete_team t ON p.id = t.project_id + and t.rec_status = 0 + LEFT JOIN t_compete_team_member m ON t.id = m.compete_team_id + and m.rec_status = 0 + LEFT JOIN t_compete_company c ON t.company_id = c.id + and c.rec_status = 0 + LEFT JOIN t_compete_player pl ON m.player_id = pl.id + and pl.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 p.type = #{type} AND p.`level` = 2 AND p.team = 1 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 GROUP BY c.id, diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml index 7effd398..9f90ba42 100644 --- a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -6,16 +6,16 @@ - + - - - - + + + + @@ -76,8 +76,8 @@ - id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status, - task_id, start_time, end_time, remark, waiver + id, project_id, player_id, team, compete_order, site, task_id, start_time, end_time, + waiver, remark, created_at, updated_at, rec_status