From 180e997b977b806b72f75a51a4580c76ba6d547d Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 13 Nov 2020 18:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteScoreController.java | 1 - .../ccsens/mt/api/CompeteVedioController.java | 22 +- .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 32 +++ .../java/com/ccsens/mt/bean/dto/VideoDto.java | 18 ++ .../ccsens/mt/bean/po/CompeteCountScore.java | 37 +-- .../mt/bean/po/CompeteCountScoreExample.java | 121 +++++----- .../ccsens/mt/bean/po/CompeteJudgment.java | 33 +++ .../mt/bean/po/CompeteJudgmentExample.java | 210 ++++++++++++++++++ .../mt/bean/po/CompeteVarietyScore.java | 7 +- .../bean/po/CompeteVarietyScoreExample.java | 21 +- .../com/ccsens/mt/bean/vo/VideoProjectVo.java | 23 ++ .../mt/persist/dao/CompeteVideoDao.java | 18 ++ .../mt/service/CompeteVedioService.java | 26 ++- .../mt/service/ICompeteVedioService.java | 4 + mt/src/main/resources/application.yml | 4 +- .../resources/mapper_dao/CompeteVideoDao.xml | 63 ++++++ .../mapper_raw/CompeteCountScoreMapper.xml | 78 +++---- .../mapper_raw/CompeteJudgmentMapper.xml | 57 ++++- .../mapper_raw/CompeteVarietyScoreMapper.xml | 14 +- 19 files changed, 637 insertions(+), 152 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java create mode 100644 mt/src/main/resources/mapper_dao/CompeteVideoDao.xml diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index a1262f24..9345cff8 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -40,5 +40,4 @@ public class CompeteScoreController { - } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java index 8141d9c4..b40a29b1 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java @@ -57,14 +57,24 @@ public class CompeteVedioController { } @MustLogin - @ApiOperation(value = "查看用户签到状态（签到用）（有筛选", notes = "Mr.王---------") + @ApiOperation(value = "查看单位签到状态（签到用）（有筛选", notes = "Mr.王---------查看单位的人的最近一条的签到状态") @RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selectUserStatus(@ApiParam @Validated @RequestBody QueryDto params) { - //这个没写完了 + public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); - return JsonResponse.newInstance().ok(); + log.info("查看单位签到状态（签到用）",params); + List peoSignStatus = iCompeteVedioService.selectCompanySignStatus(params); + return JsonResponse.newInstance().ok(peoSignStatus); + } + @MustLogin + @ApiOperation(value = "查看教练签到状态（签到用）（有筛选", notes = "Mr.王---------查看教练的人的签到状态") + @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + + + log.info("查看教练签到状态（签到用）",params); + List coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); + return JsonResponse.newInstance().ok(coachSignStatus); } @MustLogin @@ -84,8 +94,8 @@ public class CompeteVedioController { log.info("添加用户观看开幕式视频记录（签到用）",params); List list=iCompeteVedioService.selectAllCompany(params); return JsonResponse.newInstance().ok(list); - } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 4bdcd814..a2f4abec 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.dto; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -83,4 +84,35 @@ public class ScoreDto { @ApiModelProperty("分数") private BigDecimal score; } + + + @Data + @ApiModel + public static class InformationSubmitted{ + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("项目Id") + private Long projectId; + @ApiModelProperty("场次id") + private BigDecimal siteOrderId; + @ApiModelProperty("裁判id") + private Long judgmentId; +// @ApiModelProperty("几分") +// List + + } + @Data + @ApiModel + public static class Fraction{ + @ApiModelProperty("分数") + private int score; + @ApiModelProperty("分数类型") + private String code; + + + + + } + + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 151a6c2e..21bb3fd9 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -3,6 +3,7 @@ package com.ccsens.mt.bean.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NonNull; /** @@ -42,6 +43,7 @@ public class VideoDto { @Data @ApiModel("添加用户观看开幕式视频记录（签到用）") public static class Vdeo{ + @NonNull @ApiModelProperty("视频文件id") private Long companyId; } @@ -72,4 +74,20 @@ public class VideoDto { @ApiModelProperty("大赛id") private Long teamId; } + @Data + @ApiModel("参赛队伍/裁判签到表") + public static class GetTeamSignStatu{ + @ApiModelProperty("大赛id") + private Long id; + @ApiModelProperty("姓名/参赛队伍") + private String name; + + @ApiModelProperty("账号") + private String phone; + + @ApiModelProperty("签到时间") + private Long signEndTime; + + } + } 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..1836bfad 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,6 +1,7 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class CompeteCountScore implements Serializable { @@ -12,19 +13,19 @@ public class CompeteCountScore implements Serializable { private Long siteOrderId; - private Long chiefJudgmentScore; + private BigDecimal chiefJudgmentScore; - private Integer judgmentAScore; + private BigDecimal judgmentAScore; - private Integer judgmentBScore2; + private BigDecimal judgmentBScore2; - private Integer shouldTimes; + private BigDecimal shouldTimes; - private Integer deductTimes; + private BigDecimal deductTimes; private String deductCause; - private Integer finalScore; + private BigDecimal finalScore; private Date createdAt; @@ -66,43 +67,43 @@ 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() { + public BigDecimal getShouldTimes() { return shouldTimes; } - public void setShouldTimes(Integer shouldTimes) { + public void setShouldTimes(BigDecimal shouldTimes) { this.shouldTimes = shouldTimes; } - public Integer getDeductTimes() { + public BigDecimal getDeductTimes() { return deductTimes; } - public void setDeductTimes(Integer deductTimes) { + public void setDeductTimes(BigDecimal deductTimes) { this.deductTimes = deductTimes; } @@ -114,11 +115,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; } 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..832f2f73 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; @@ -355,52 +356,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 +416,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,52 +476,52 @@ 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; } @@ -535,52 +536,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andShouldTimesEqualTo(Integer value) { + public Criteria andShouldTimesEqualTo(BigDecimal value) { addCriterion("should_times =", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesNotEqualTo(Integer value) { + public Criteria andShouldTimesNotEqualTo(BigDecimal value) { addCriterion("should_times <>", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesGreaterThan(Integer value) { + public Criteria andShouldTimesGreaterThan(BigDecimal value) { addCriterion("should_times >", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + public Criteria andShouldTimesGreaterThanOrEqualTo(BigDecimal value) { addCriterion("should_times >=", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesLessThan(Integer value) { + public Criteria andShouldTimesLessThan(BigDecimal value) { addCriterion("should_times <", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + public Criteria andShouldTimesLessThanOrEqualTo(BigDecimal value) { addCriterion("should_times <=", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesIn(List values) { + public Criteria andShouldTimesIn(List values) { addCriterion("should_times in", values, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesNotIn(List values) { + public Criteria andShouldTimesNotIn(List values) { addCriterion("should_times not in", values, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + public Criteria andShouldTimesBetween(BigDecimal value1, BigDecimal value2) { addCriterion("should_times between", value1, value2, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + public Criteria andShouldTimesNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("should_times not between", value1, value2, "shouldTimes"); return (Criteria) this; } @@ -595,52 +596,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andDeductTimesEqualTo(Integer value) { + public Criteria andDeductTimesEqualTo(BigDecimal value) { addCriterion("deduct_times =", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesNotEqualTo(Integer value) { + public Criteria andDeductTimesNotEqualTo(BigDecimal value) { addCriterion("deduct_times <>", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesGreaterThan(Integer value) { + public Criteria andDeductTimesGreaterThan(BigDecimal value) { addCriterion("deduct_times >", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesGreaterThanOrEqualTo(Integer value) { + public Criteria andDeductTimesGreaterThanOrEqualTo(BigDecimal value) { addCriterion("deduct_times >=", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesLessThan(Integer value) { + public Criteria andDeductTimesLessThan(BigDecimal value) { addCriterion("deduct_times <", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesLessThanOrEqualTo(Integer value) { + public Criteria andDeductTimesLessThanOrEqualTo(BigDecimal value) { addCriterion("deduct_times <=", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesIn(List values) { + public Criteria andDeductTimesIn(List values) { addCriterion("deduct_times in", values, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesNotIn(List values) { + public Criteria andDeductTimesNotIn(List values) { addCriterion("deduct_times not in", values, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesBetween(Integer value1, Integer value2) { + public Criteria andDeductTimesBetween(BigDecimal value1, BigDecimal value2) { addCriterion("deduct_times between", value1, value2, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesNotBetween(Integer value1, Integer value2) { + public Criteria andDeductTimesNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("deduct_times not between", value1, value2, "deductTimes"); 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/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java index c2de5e32..079c5ad4 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -6,6 +6,12 @@ import java.util.Date; public class CompeteJudgment implements Serializable { private Long id; + private String name; + + private String phone; + + private String remark; + private Long competeTimeId; private Long siteOrderId; @@ -32,6 +38,30 @@ public class CompeteJudgment implements Serializable { this.id = id; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone == null ? null : phone.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + public Long getCompeteTimeId() { return competeTimeId; } @@ -103,6 +133,9 @@ public class CompeteJudgment implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", name=").append(name); + sb.append(", phone=").append(phone); + sb.append(", remark=").append(remark); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", projectId=").append(projectId); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java index 4d75f9ed..f88f0ccc 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -165,6 +165,216 @@ public class CompeteJudgmentExample { return (Criteria) this; } + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("phone is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("phone is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("phone =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("phone <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("phone >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("phone >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("phone <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("phone <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("phone like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("phone not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("phone in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("phone not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("phone between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("phone not between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; 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/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index 9130201c..0dd30cbb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -26,5 +26,28 @@ public class VideoProjectVo { private String companyName; } + @Data + @ApiModel("查找单位签到的状态") + public static class PeoSignStatu{ + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("最近签到时间") + private Long time; + } + @Data + @ApiModel("查找裁判签到的状态") + public static class CoachSignStatu{ + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("裁判类型") + private byte chiefJudgment; + @ApiModelProperty("最近签到时间") + private Long time; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java new file mode 100644 index 00000000..f014c8c0 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author Mr.王 + */ +public interface CompeteVideoDao extends CompeteCompanyMapper { + + List selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + + List selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 78556327..0f3a36fa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.Snowflake; import com.ccsens.mt.bean.dto.VideoDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.dao.CompeteVideoDao; import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper; import com.ccsens.mt.persist.mapper.CompeteProjectMapper; @@ -37,7 +38,8 @@ public class CompeteVedioService implements ICompeteVedioService{ private CompeteProjectMapper competeProjectMapper; @Resource private CompeteCompanyMapper competeCompanyMapper; - + @Resource + private CompeteVideoDao competeVideoDao; @Override public void insertSignVideo(Long companyId) { @@ -99,4 +101,26 @@ public class CompeteVedioService implements ICompeteVedioService{ }); return list1; } + /** + * 查看公司的签到状态 + * @param params + * @return + */ + @Override + public List selectCompanySignStatus(QueryDto params) { + return competeVideoDao.selectCompanySignStatus(params.getParam()); + } + /** + * 查看教练的签到状态 + * @param params + * @return + */ + @Override + public List selectCoachSignStatus(QueryDto params) { + log.info(params.getParam().toString()); + return competeVideoDao.selectCoachSignStatus(params.getParam()); + } + + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java index 3cc76419..96a011e9 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -27,4 +27,8 @@ public interface ICompeteVedioService { List selectTwoProject(QueryDto params); List selectAllCompany(QueryDto params); + + List selectCompanySignStatus(QueryDto params); + + List selectCoachSignStatus(QueryDto params); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml new file mode 100644 index 00000000..6bbbcbc4 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -0,0 +1,63 @@ + + + + + + + \ 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..bf9b3dc5 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -6,13 +6,13 @@ - - - - - + + + + + - + @@ -117,9 +117,9 @@ 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}, + #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, #{judgmentAScore,jdbcType=DECIMAL}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{shouldTimes,jdbcType=DECIMAL}, #{deductTimes,jdbcType=DECIMAL}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -182,25 +182,25 @@ #{siteOrderId,jdbcType=BIGINT}, - #{chiefJudgmentScore,jdbcType=BIGINT}, + #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=DECIMAL}, - #{shouldTimes,jdbcType=INTEGER}, + #{shouldTimes,jdbcType=DECIMAL}, - #{deductTimes,jdbcType=INTEGER}, + #{deductTimes,jdbcType=DECIMAL}, #{deductCause,jdbcType=VARCHAR}, - #{finalScore,jdbcType=INTEGER}, + #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, @@ -235,25 +235,25 @@ 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}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + should_times = #{record.shouldTimes,jdbcType=DECIMAL}, - deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + deduct_times = #{record.deductTimes,jdbcType=DECIMAL}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -275,13 +275,13 @@ compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, - deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, + should_times = #{record.shouldTimes,jdbcType=DECIMAL}, + deduct_times = #{record.deductTimes,jdbcType=DECIMAL}, 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,25 +302,25 @@ 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}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, - should_times = #{shouldTimes,jdbcType=INTEGER}, + should_times = #{shouldTimes,jdbcType=DECIMAL}, - deduct_times = #{deductTimes,jdbcType=INTEGER}, + deduct_times = #{deductTimes,jdbcType=DECIMAL}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -339,13 +339,13 @@ set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - should_times = #{shouldTimes,jdbcType=INTEGER}, - deduct_times = #{deductTimes,jdbcType=INTEGER}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, + should_times = #{shouldTimes,jdbcType=DECIMAL}, + deduct_times = #{deductTimes,jdbcType=DECIMAL}, 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} diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml index 13d3e48c..443a9a91 100644 --- a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -3,6 +3,9 @@ + + + @@ -71,8 +74,8 @@ - id, compete_time_id, site_order_id, project_id, user_id, chief_judgment, created_at, - updated_at, rec_status + id, name, phone, remark, compete_time_id, site_order_id, project_id, user_id, chief_judgment, + created_at, updated_at, rec_status