From 1354b2f766d1b01bb98b0969971df150b2fc1be9 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 13 Nov 2020 19:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=94=E8=B5=9B=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E9=85=8D=E7=BD=AE1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteTaskController.java | 11 + .../ccsens/mt/bean/po/CompeteCountScore.java | 49 ++--- .../mt/bean/po/CompeteCountScoreExample.java | 201 +++++++++--------- .../mt/bean/po/CompeteCountScoreKey.java | 39 ++++ .../mt/bean/po/CompeteVarietyScore.java | 7 +- .../bean/po/CompeteVarietyScoreExample.java | 21 +- .../java/com/ccsens/mt/bean/vo/TableVo.java | 6 + .../mt/persist/dao/CompetePlayerDao.java | 8 + .../mapper/CompeteCountScoreMapper.java | 5 +- .../ccsens/mt/service/CompeteTaskService.java | 106 ++++++++- .../mt/service/ICompeteTaskService.java | 8 + .../ccsens/mt/service/ProvinceService.java | 33 ++- .../resources/mapper_dao/CompetePlayerDao.xml | 10 + .../mapper_raw/CompeteCountScoreMapper.xml | 100 ++++----- .../mapper_raw/CompeteVarietyScoreMapper.xml | 14 +- 15 files changed, 401 insertions(+), 217 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index c8ed379f..773aecbf 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -1,6 +1,7 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.ICompeteTaskService; @@ -30,6 +31,16 @@ public class CompeteTaskController { @Resource private ICompeteTaskService competeTaskService; + @MustLogin + @ApiOperation(value = "查找日期配置", notes = "zy:查找项目对应的配置信息") + @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryCompeteConfig(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("日程安排更新：{}",params); + List dailyScheduleProcessList = competeTaskService.queryCompeteConfig(params.getParam()); + log.info("日程安排更新：{}",dailyScheduleProcessList); + return JsonResponse.newInstance().ok(dailyScheduleProcessList); + } + @MustLogin @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java index d06a7d6b..d89e1feb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -1,30 +1,27 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; -public class CompeteCountScore implements Serializable { - private Long id; - +public class CompeteCountScore extends CompeteCountScoreKey implements Serializable { private Long competeTimeId; private Long projectId; private Long siteOrderId; - private Long chiefJudgmentScore; - - private Integer judgmentAScore; + private BigDecimal chiefJudgmentScore; - private Integer judgmentBScore2; + private BigDecimal judgmentAScore; - private Integer shouldTimes; + private BigDecimal judgmentBScore2; private Integer deductTimes; private String deductCause; - private Integer finalScore; + private BigDecimal finalScore; private Date createdAt; @@ -34,14 +31,6 @@ public class CompeteCountScore implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - public Long getCompeteTimeId() { return competeTimeId; } @@ -66,38 +55,30 @@ public class CompeteCountScore implements Serializable { this.siteOrderId = siteOrderId; } - public Long getChiefJudgmentScore() { + public BigDecimal getChiefJudgmentScore() { return chiefJudgmentScore; } - public void setChiefJudgmentScore(Long chiefJudgmentScore) { + public void setChiefJudgmentScore(BigDecimal chiefJudgmentScore) { this.chiefJudgmentScore = chiefJudgmentScore; } - public Integer getJudgmentAScore() { + public BigDecimal getJudgmentAScore() { return judgmentAScore; } - public void setJudgmentAScore(Integer judgmentAScore) { + public void setJudgmentAScore(BigDecimal judgmentAScore) { this.judgmentAScore = judgmentAScore; } - public Integer getJudgmentBScore2() { + public BigDecimal getJudgmentBScore2() { return judgmentBScore2; } - public void setJudgmentBScore2(Integer judgmentBScore2) { + public void setJudgmentBScore2(BigDecimal judgmentBScore2) { this.judgmentBScore2 = judgmentBScore2; } - public Integer getShouldTimes() { - return shouldTimes; - } - - public void setShouldTimes(Integer shouldTimes) { - this.shouldTimes = shouldTimes; - } - public Integer getDeductTimes() { return deductTimes; } @@ -114,11 +95,11 @@ public class CompeteCountScore implements Serializable { this.deductCause = deductCause == null ? null : deductCause.trim(); } - public Integer getFinalScore() { + public BigDecimal getFinalScore() { return finalScore; } - public void setFinalScore(Integer finalScore) { + public void setFinalScore(BigDecimal finalScore) { this.finalScore = finalScore; } @@ -152,14 +133,12 @@ public class CompeteCountScore implements Serializable { sb.append(getClass().getSimpleName()); sb.append(" ["); sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", projectId=").append(projectId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", chiefJudgmentScore=").append(chiefJudgmentScore); sb.append(", judgmentAScore=").append(judgmentAScore); sb.append(", judgmentBScore2=").append(judgmentBScore2); - sb.append(", shouldTimes=").append(shouldTimes); sb.append(", deductTimes=").append(deductTimes); sb.append(", deductCause=").append(deductCause); sb.append(", finalScore=").append(finalScore); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java index d5ff54db..c72f3961 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -165,6 +166,66 @@ public class CompeteCountScoreExample { return (Criteria) this; } + public Criteria andShouldTimesIsNull() { + addCriterion("should_times is null"); + return (Criteria) this; + } + + public Criteria andShouldTimesIsNotNull() { + addCriterion("should_times is not null"); + return (Criteria) this; + } + + public Criteria andShouldTimesEqualTo(Integer value) { + addCriterion("should_times =", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotEqualTo(Integer value) { + addCriterion("should_times <>", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThan(Integer value) { + addCriterion("should_times >", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("should_times >=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThan(Integer value) { + addCriterion("should_times <", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + addCriterion("should_times <=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesIn(List values) { + addCriterion("should_times in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotIn(List values) { + addCriterion("should_times not in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + addCriterion("should_times between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + addCriterion("should_times not between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; @@ -355,52 +416,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andChiefJudgmentScoreEqualTo(Long value) { + public Criteria andChiefJudgmentScoreEqualTo(BigDecimal value) { addCriterion("chief_judgment_score =", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotEqualTo(Long value) { + public Criteria andChiefJudgmentScoreNotEqualTo(BigDecimal value) { addCriterion("chief_judgment_score <>", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreGreaterThan(Long value) { + public Criteria andChiefJudgmentScoreGreaterThan(BigDecimal value) { addCriterion("chief_judgment_score >", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(Long value) { + public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("chief_judgment_score >=", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreLessThan(Long value) { + public Criteria andChiefJudgmentScoreLessThan(BigDecimal value) { addCriterion("chief_judgment_score <", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreLessThanOrEqualTo(Long value) { + public Criteria andChiefJudgmentScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("chief_judgment_score <=", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreIn(List values) { + public Criteria andChiefJudgmentScoreIn(List values) { addCriterion("chief_judgment_score in", values, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotIn(List values) { + public Criteria andChiefJudgmentScoreNotIn(List values) { addCriterion("chief_judgment_score not in", values, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreBetween(Long value1, Long value2) { + public Criteria andChiefJudgmentScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("chief_judgment_score between", value1, value2, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotBetween(Long value1, Long value2) { + public Criteria andChiefJudgmentScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("chief_judgment_score not between", value1, value2, "chiefJudgmentScore"); return (Criteria) this; } @@ -415,52 +476,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andJudgmentAScoreEqualTo(Integer value) { + public Criteria andJudgmentAScoreEqualTo(BigDecimal value) { addCriterion("judgment_a_score =", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotEqualTo(Integer value) { + public Criteria andJudgmentAScoreNotEqualTo(BigDecimal value) { addCriterion("judgment_a_score <>", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreGreaterThan(Integer value) { + public Criteria andJudgmentAScoreGreaterThan(BigDecimal value) { addCriterion("judgment_a_score >", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andJudgmentAScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("judgment_a_score >=", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreLessThan(Integer value) { + public Criteria andJudgmentAScoreLessThan(BigDecimal value) { addCriterion("judgment_a_score <", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreLessThanOrEqualTo(Integer value) { + public Criteria andJudgmentAScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("judgment_a_score <=", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreIn(List values) { + public Criteria andJudgmentAScoreIn(List values) { addCriterion("judgment_a_score in", values, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotIn(List values) { + public Criteria andJudgmentAScoreNotIn(List values) { addCriterion("judgment_a_score not in", values, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreBetween(Integer value1, Integer value2) { + public Criteria andJudgmentAScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_a_score between", value1, value2, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotBetween(Integer value1, Integer value2) { + public Criteria andJudgmentAScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_a_score not between", value1, value2, "judgmentAScore"); return (Criteria) this; } @@ -475,116 +536,56 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andJudgmentBScore2EqualTo(Integer value) { + public Criteria andJudgmentBScore2EqualTo(BigDecimal value) { addCriterion("judgment_b_score2 =", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotEqualTo(Integer value) { + public Criteria andJudgmentBScore2NotEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 <>", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2GreaterThan(Integer value) { + public Criteria andJudgmentBScore2GreaterThan(BigDecimal value) { addCriterion("judgment_b_score2 >", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2GreaterThanOrEqualTo(Integer value) { + public Criteria andJudgmentBScore2GreaterThanOrEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 >=", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2LessThan(Integer value) { + public Criteria andJudgmentBScore2LessThan(BigDecimal value) { addCriterion("judgment_b_score2 <", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2LessThanOrEqualTo(Integer value) { + public Criteria andJudgmentBScore2LessThanOrEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 <=", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2In(List values) { + public Criteria andJudgmentBScore2In(List values) { addCriterion("judgment_b_score2 in", values, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotIn(List values) { + public Criteria andJudgmentBScore2NotIn(List values) { addCriterion("judgment_b_score2 not in", values, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2Between(Integer value1, Integer value2) { + public Criteria andJudgmentBScore2Between(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_b_score2 between", value1, value2, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotBetween(Integer value1, Integer value2) { + public Criteria andJudgmentBScore2NotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_b_score2 not between", value1, value2, "judgmentBScore2"); return (Criteria) this; } - public Criteria andShouldTimesIsNull() { - addCriterion("should_times is null"); - return (Criteria) this; - } - - public Criteria andShouldTimesIsNotNull() { - addCriterion("should_times is not null"); - return (Criteria) this; - } - - public Criteria andShouldTimesEqualTo(Integer value) { - addCriterion("should_times =", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotEqualTo(Integer value) { - addCriterion("should_times <>", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThan(Integer value) { - addCriterion("should_times >", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { - addCriterion("should_times >=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThan(Integer value) { - addCriterion("should_times <", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { - addCriterion("should_times <=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesIn(List values) { - addCriterion("should_times in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotIn(List values) { - addCriterion("should_times not in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesBetween(Integer value1, Integer value2) { - addCriterion("should_times between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { - addCriterion("should_times not between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - public Criteria andDeductTimesIsNull() { addCriterion("deduct_times is null"); return (Criteria) this; @@ -725,52 +726,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andFinalScoreEqualTo(Integer value) { + public Criteria andFinalScoreEqualTo(BigDecimal value) { addCriterion("final_score =", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotEqualTo(Integer value) { + public Criteria andFinalScoreNotEqualTo(BigDecimal value) { addCriterion("final_score <>", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreGreaterThan(Integer value) { + public Criteria andFinalScoreGreaterThan(BigDecimal value) { addCriterion("final_score >", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andFinalScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("final_score >=", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreLessThan(Integer value) { + public Criteria andFinalScoreLessThan(BigDecimal value) { addCriterion("final_score <", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreLessThanOrEqualTo(Integer value) { + public Criteria andFinalScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("final_score <=", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreIn(List values) { + public Criteria andFinalScoreIn(List values) { addCriterion("final_score in", values, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotIn(List values) { + public Criteria andFinalScoreNotIn(List values) { addCriterion("final_score not in", values, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreBetween(Integer value1, Integer value2) { + public Criteria andFinalScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("final_score between", value1, value2, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotBetween(Integer value1, Integer value2) { + public Criteria andFinalScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("final_score not between", value1, value2, "finalScore"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java new file mode 100644 index 00000000..8eb52089 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java @@ -0,0 +1,39 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; + +public class CompeteCountScoreKey implements Serializable { + private Long id; + + private Integer shouldTimes; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getShouldTimes() { + return shouldTimes; + } + + public void setShouldTimes(Integer shouldTimes) { + this.shouldTimes = shouldTimes; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", shouldTimes=").append(shouldTimes); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java index 9fa53c5a..e264a762 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java @@ -1,6 +1,7 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class CompeteVarietyScore implements Serializable { @@ -14,7 +15,7 @@ public class CompeteVarietyScore implements Serializable { private String code; - private Integer score; + private BigDecimal score; private Long judgmentId; @@ -66,11 +67,11 @@ public class CompeteVarietyScore implements Serializable { this.code = code == null ? null : code.trim(); } - public Integer getScore() { + public BigDecimal getScore() { return score; } - public void setScore(Integer score) { + public void setScore(BigDecimal score) { this.score = score; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java index 05ddc769..633c6a56 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -425,52 +426,52 @@ public class CompeteVarietyScoreExample { return (Criteria) this; } - public Criteria andScoreEqualTo(Integer value) { + public Criteria andScoreEqualTo(BigDecimal value) { addCriterion("score =", value, "score"); return (Criteria) this; } - public Criteria andScoreNotEqualTo(Integer value) { + public Criteria andScoreNotEqualTo(BigDecimal value) { addCriterion("score <>", value, "score"); return (Criteria) this; } - public Criteria andScoreGreaterThan(Integer value) { + public Criteria andScoreGreaterThan(BigDecimal value) { addCriterion("score >", value, "score"); return (Criteria) this; } - public Criteria andScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("score >=", value, "score"); return (Criteria) this; } - public Criteria andScoreLessThan(Integer value) { + public Criteria andScoreLessThan(BigDecimal value) { addCriterion("score <", value, "score"); return (Criteria) this; } - public Criteria andScoreLessThanOrEqualTo(Integer value) { + public Criteria andScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("score <=", value, "score"); return (Criteria) this; } - public Criteria andScoreIn(List values) { + public Criteria andScoreIn(List values) { addCriterion("score in", values, "score"); return (Criteria) this; } - public Criteria andScoreNotIn(List values) { + public Criteria andScoreNotIn(List values) { addCriterion("score not in", values, "score"); return (Criteria) this; } - public Criteria andScoreBetween(Integer value1, Integer value2) { + public Criteria andScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("score between", value1, value2, "score"); return (Criteria) this; } - public Criteria andScoreNotBetween(Integer value1, Integer value2) { + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("score not between", value1, value2, "score"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 0ff435d9..48fec61e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -165,6 +165,12 @@ public class TableVo { return 0; } + public Long getStartTime(){ + return startTime == 0 ? null : startTime; + } + public Long getEndTime(){ + return endTime == 0 ? null : endTime; + } public int getTimeSum(){ if(duration != 0 && games != 0) { return duration * games; diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java index a9284b3a..37f54b43 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java @@ -78,4 +78,12 @@ public interface CompetePlayerDao extends CompetePlayerMapper { CompeteGroup selectBySexAndRemark(int gender, int groupRemark); List selectSinglePlayerByProjectId(Long id); + + /** + * 在这个比赛中是否注册查找此身份证是否被注册 + * @param type 比赛类型 + * @param idCard 身份证 + * @return + */ + int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java index faf0e354..5592b7ec 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java @@ -2,6 +2,7 @@ package com.ccsens.mt.persist.mapper; import com.ccsens.mt.bean.po.CompeteCountScore; import com.ccsens.mt.bean.po.CompeteCountScoreExample; +import com.ccsens.mt.bean.po.CompeteCountScoreKey; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ public interface CompeteCountScoreMapper { int deleteByExample(CompeteCountScoreExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(CompeteCountScoreKey key); int insert(CompeteCountScore record); @@ -18,7 +19,7 @@ public interface CompeteCountScoreMapper { List selectByExample(CompeteCountScoreExample example); - CompeteCountScore selectByPrimaryKey(Long id); + CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key); int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example); 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 fe974b87..5bdd5bf5 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -3,13 +3,16 @@ package com.ccsens.mt.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; +import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; -import com.ccsens.mt.bean.po.CompeteProject; -import com.ccsens.mt.bean.po.CompeteProjectConfig; -import com.ccsens.mt.bean.po.CompeteProjectConfigExample; +import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.CompeteProjectConfigDao; import com.ccsens.mt.persist.dao.CompeteProjectDao; +import com.ccsens.mt.persist.dao.CompeteTeamDao; +import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.mapper.CompeteProjectPlayerMapper; +import com.ccsens.mt.persist.mapper.CompeteStartOrderMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -32,7 +35,25 @@ public class CompeteTaskService implements ICompeteTaskService{ @Resource private CompeteProjectDao competeProjectDao; @Resource + private CompeteTimeDao competeTimeDao; + @Resource + private CompeteProjectPlayerMapper projectPlayerMapper; + @Resource private Snowflake snowflake; + @Resource + private CompeteStartOrderMapper startOrderMapper; + @Resource + private CompeteTeamDao competeTeamDao; + + @Override + public List queryCompeteConfig(CompeteDto.CompeteTime param) { + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); + List competeProjectConfigList = new ArrayList<>(); + if(ObjectUtil.isNotNull(competeTime)) { + competeProjectConfigList = projectConfigDao.queryProjectConfig(competeTime.getType()); + } + return competeProjectConfigList; + } @Override public List updateCompeteProjectConfig(List param) { @@ -70,8 +91,87 @@ public class CompeteTaskService implements ICompeteTaskService{ projectConfigDao.insertSelective(competeProjectConfig); } // TODO 生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig); }); } return projectConfigDao.queryProjectConfig(type.get()); } + /** + * 修改配置时生成出场顺序(先删除之前的数据) + */ + public void setStartOrder(CompeteProjectConfig competeProjectConfig) { + if (ObjectUtil.isNotNull(competeProjectConfig)) { + //查找项目 + CompeteProject project = competeProjectDao.selectByPrimaryKey(competeProjectConfig.getProjectId()); + if (ObjectUtil.isNotNull(project)) { + //首先删除此项目以前的出场顺序 + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if(ObjectUtil.isNotNull(startOrderExample)){ + startOrderList.forEach(startOrder -> { + startOrder.setRecStatus((byte) 2); + startOrderMapper.updateByPrimaryKeySelective(startOrder); + }); + } + //判断是团队还是个人项目 + if (project.getTeam() == 0) { + //个人项目查找所有参赛信息 + CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); + projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId()); + List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); + if (CollectionUtil.isNotEmpty(projectPlayerList)) { + //场次 + int competeOrder = 1; + //场地 + int site = 1; + for (CompeteProjectPlayer projectPlayer : projectPlayerList) { + //添加出场顺序 + CompeteStartOrder competeStartOrder = new CompeteStartOrder(); + competeStartOrder.setId(snowflake.nextId()); + competeStartOrder.setProjectId(project.getId()); + competeStartOrder.setPlayerId(projectPlayer.getId()); + competeStartOrder.setTeam((byte) 0); + competeStartOrder.setSite((byte) site); + competeStartOrder.setCompeteOrder((byte) competeOrder); + startOrderMapper.insertSelective(competeStartOrder); + site++; + if(site > competeProjectConfig.getSiteNum()){ + site = 1; + competeOrder++; + } + } + } + } else { + //团体项目查找所有参赛队伍 + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(project.getId()); + List teamList = competeTeamDao.selectByExample(teamExample); + if(CollectionUtil.isNotEmpty(teamList)){ + //场次 + int competeOrder = 1; + //场地 + int site = 1; + for (CompeteTeam competeTeam : teamList) { + //添加出场顺序 + CompeteStartOrder competeStartOrder = new CompeteStartOrder(); + competeStartOrder.setId(snowflake.nextId()); + competeStartOrder.setProjectId(project.getId()); + competeStartOrder.setPlayerId(competeTeam.getId()); + competeStartOrder.setSite((byte) site); + competeStartOrder.setTeam((byte) 1); + competeStartOrder.setCompeteOrder((byte) competeOrder); + startOrderMapper.insertSelective(competeStartOrder); + site++; + if(site > competeProjectConfig.getSiteNum()){ + site = 1; + competeOrder++; + } + } + } + } + } + } + } + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index 1ba25d4d..02e716af 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -1,5 +1,6 @@ package com.ccsens.mt.service; +import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; import com.ccsens.mt.bean.vo.TableVo; @@ -15,4 +16,11 @@ public interface ICompeteTaskService { * @return */ List updateCompeteProjectConfig(List param); + + /** + * 查找所有项目的日程配置 + * @param param + * @return + */ + List queryCompeteConfig(CompeteDto.CompeteTime param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index ea326fc3..39521b3b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -114,6 +114,16 @@ public class ProvinceService implements IProvinceService { */ @Override public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) { + int type = 0; + if(ObjectUtil.isNotNull(param.getCompeteId())){ + CompeteCompany company = competeCompanyDao.selectByPrimaryKey(param.getCompeteId()); + if(ObjectUtil.isNull(company)) { + throw new BaseException(CodeEnum.NOT_COMPANY); + } + type = company.getType(); + }else { + throw new BaseException(CodeEnum.NOT_COMPANY); + } //判断选手id是否为空 if(ObjectUtil.isNull(param.getPlayerId())){ //id为空，新加一个选手 @@ -121,13 +131,17 @@ public class ProvinceService implements IProvinceService { player.setId(snowflake.nextId()); player.setName(param.getPlayerName()); - if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); } + //身份证不能为空，且正确 if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} //是否已注册 - CompetePlayerExample competePlayerExample = new CompetePlayerExample(); - competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()); - if(competePlayerDao.countByExample(competePlayerExample) != 0){ + int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard()); +// CompetePlayerExample competePlayerExample = new CompetePlayerExample(); +// competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()); +// if(competePlayerDao.countByExample(competePlayerExample) != 0){ +// throw new BaseException(CodeEnum.ID_CARD_ALREADY); +// } + if(idCardNum > 0){ throw new BaseException(CodeEnum.ID_CARD_ALREADY); } //验证性别是否正确 @@ -186,9 +200,14 @@ public class ProvinceService implements IProvinceService { //身份证正确 if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} //是否已注册 - CompetePlayerExample competePlayerExample = new CompetePlayerExample(); - competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()).andIdNotEqualTo(param.getPlayerId()); - if(competePlayerDao.countByExample(competePlayerExample) != 0){throw new BaseException(CodeEnum.ID_CARD_ALREADY);} + //是否已注册 + int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard()); + if(idCardNum > 0){ + throw new BaseException(CodeEnum.ID_CARD_ALREADY); + } +// CompetePlayerExample competePlayerExample = new CompetePlayerExample(); +// competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()).andIdNotEqualTo(param.getPlayerId()); +// if(competePlayerDao.countByExample(competePlayerExample) != 0){throw new BaseException(CodeEnum.ID_CARD_ALREADY);} //验证性别是否正确 int gender = IdcardUtil.getGenderByIdCard(param.getIdCard()); if(gender != param.getGender()){ diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 1dcb019d..49ae599c 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -300,4 +300,14 @@ and tcc.rec_status=0 and tcg.rec_status=0 + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 3fba3694..6f586d68 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,16 +3,16 @@ + - - - - + + + - + @@ -76,8 +76,8 @@ - id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, + id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -111,15 +113,15 @@ - insert into t_compete_count_score (id, compete_time_id, project_id, - site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, + insert into t_compete_count_score (id, should_times, compete_time_id, + project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, - #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, - #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, + #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -128,6 +130,9 @@ id, + + should_times, + compete_time_id, @@ -146,9 +151,6 @@ judgment_b_score2, - - should_times, - deduct_times, @@ -172,6 +174,9 @@ #{id,jdbcType=BIGINT}, + + #{shouldTimes,jdbcType=INTEGER}, + #{competeTimeId,jdbcType=BIGINT}, @@ -182,16 +187,13 @@ #{siteOrderId,jdbcType=BIGINT}, - #{chiefJudgmentScore,jdbcType=BIGINT}, + #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=INTEGER}, - - - #{shouldTimes,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, @@ -200,7 +202,7 @@ #{deductCause,jdbcType=VARCHAR}, - #{finalScore,jdbcType=INTEGER}, + #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, @@ -225,6 +227,9 @@ id = #{record.id,jdbcType=BIGINT}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -235,16 +240,13 @@ site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, @@ -253,7 +255,7 @@ deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -272,16 +274,16 @@ update t_compete_count_score set id = #{record.id,jdbcType=BIGINT}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -302,16 +304,13 @@ site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, @@ -320,7 +319,7 @@ deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -333,22 +332,23 @@ where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - should_times = #{shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml index 12ac81e2..f4b26c7c 100644 --- a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml @@ -7,7 +7,7 @@ - + @@ -111,7 +111,7 @@ judgment_id, created_at, updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -166,7 +166,7 @@ #{code,jdbcType=VARCHAR}, - #{score,jdbcType=INTEGER}, + #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, @@ -207,7 +207,7 @@ code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, @@ -233,7 +233,7 @@ project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, @@ -258,7 +258,7 @@ code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, @@ -281,7 +281,7 @@ project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP},