11-13-2

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

@@ -3,6 +3,7 @@ package com.ccsens.mt.api;
 import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.bean.vo.ScoreVo;
 import com.ccsens.mt.service.ICompeteService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
@@ -40,8 +41,8 @@ public class CompeteScoreController {
     }
 
     @MustLogin
-    @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "")
+    @ApiOperation(value = "项目状态", notes = "")
-    @RequestMapping(value = "countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<CompeteVo.CountScore> countScore(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
         log.info("查询比赛项目上的参赛选手列表：{}",params);
         List<CompeteVo.CountScore> countScoreList =  competeService.countScore(params.getParam());
@@ -49,13 +50,30 @@ public class CompeteScoreController {
     }
 
     @MustLogin
-    @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "")
+    @ApiOperation(value = "选手排名", notes = "")
-    @RequestMapping(value = "countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<CompeteVo.CountScore> countScoreDetail(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.ProjectIdAndGroupId> params) {
+    public JsonResponse<ScoreVo.CompeteScore> countScoreDetail(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.ProjectIdAndGroupId> params) {
         log.info("查询比赛项目上的参赛选手列表：{}",params);
-         competeService.countScoreDetail(params.getParam());
+        List<ScoreVo.CompeteScore> competeScores = competeService.countScoreDetail(params.getParam());
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(competeScores);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "")
+    @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ScoreVo.CountScoreCurrentSite> countScoreCurrentSite(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteSite> params) {
+        log.info("查询比赛项目上的参赛选手列表：{}",params);
+        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeService.countScoreCurrentSite(params.getParam());
+        return JsonResponse.newInstance().ok(countScoreCurrentSites);
     }
 
+    @MustLogin
+    @ApiOperation(value = "技术赛提交分数", notes = "")
+    @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.SubmitScore> params) {
+        log.info("查询比赛项目上的参赛选手列表：{}",params);
+        competeService.submitScore(params.getParam());
+        return JsonResponse.newInstance().ok();
+    }
 
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NonNull;
 
 import javax.validation.constraints.*;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -21,6 +22,14 @@ public class CompeteDto {
         private int type;
     }
 
+    @Data
+    @ApiModel
+    public static class CompeteSite{
+        @NotNull
+        @ApiModelProperty("场次id")
+        private int siteId;
+    }
+
     @Data
     @ApiModel
     public static class CompeteTime{
@@ -331,7 +340,32 @@ public class CompeteDto {
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("组别id")
-        private Long groupId;
+        private Long competeGroupId;
+    }
+
+    @Data
+    @ApiModel("提交分数")
+    public static class SubmitScore{
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("大赛id")
+        private Long competeTimeId;
+        @ApiModelProperty("场次id")
+        private Long siteOrderId;
+        @ApiModelProperty("主裁打分")
+        private BigDecimal mainScore;
+        @ApiModelProperty("主裁1打分")
+        private BigDecimal mainOneScore;
+        @ApiModelProperty("主裁2打分")
+        private BigDecimal mainTwoScore;
+        @ApiModelProperty("应得分")
+        private int shouldScore;
+        @ApiModelProperty("扣除次数")
+        private int deductTime;
+        @ApiModelProperty("扣除原因")
+        private String deductReason;
+        @ApiModelProperty("最终成绩")
+        private BigDecimal finalScore;
     }
 
 

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 {
+public class CompeteCountScore extends CompeteCountScoreKey implements Serializable {
-    private Long id;
-
     private Long competeTimeId;
 
     private Long projectId;
 
     private Long siteOrderId;
 
-    private Long chiefJudgmentScore;
+    private BigDecimal chiefJudgmentScore;
-
-    private Integer judgmentAScore;
 
-    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);

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<Integer> values) {
+            addCriterion("should_times in", values, "shouldTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShouldTimesNotIn(List<Integer> 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<Long> values) {
+        public Criteria andChiefJudgmentScoreIn(List<BigDecimal> values) {
             addCriterion("chief_judgment_score in", values, "chiefJudgmentScore");
             return (Criteria) this;
         }
 
-        public Criteria andChiefJudgmentScoreNotIn(List<Long> values) {
+        public Criteria andChiefJudgmentScoreNotIn(List<BigDecimal> 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<Integer> values) {
+        public Criteria andJudgmentAScoreIn(List<BigDecimal> values) {
             addCriterion("judgment_a_score in", values, "judgmentAScore");
             return (Criteria) this;
         }
 
-        public Criteria andJudgmentAScoreNotIn(List<Integer> values) {
+        public Criteria andJudgmentAScoreNotIn(List<BigDecimal> 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<Integer> values) {
+        public Criteria andJudgmentBScore2In(List<BigDecimal> values) {
             addCriterion("judgment_b_score2 in", values, "judgmentBScore2");
             return (Criteria) this;
         }
 
-        public Criteria andJudgmentBScore2NotIn(List<Integer> values) {
+        public Criteria andJudgmentBScore2NotIn(List<BigDecimal> 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<Integer> values) {
-            addCriterion("should_times in", values, "shouldTimes");
-            return (Criteria) this;
-        }
-
-        public Criteria andShouldTimesNotIn(List<Integer> 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<Integer> values) {
+        public Criteria andFinalScoreIn(List<BigDecimal> values) {
             addCriterion("final_score in", values, "finalScore");
             return (Criteria) this;
         }
 
-        public Criteria andFinalScoreNotIn(List<Integer> values) {
+        public Criteria andFinalScoreNotIn(List<BigDecimal> 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;
         }

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();
+    }
+}

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;
     }
 

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<Integer> values) {
+        public Criteria andScoreIn(List<BigDecimal> values) {
             addCriterion("score in", values, "score");
             return (Criteria) this;
         }
 
-        public Criteria andScoreNotIn(List<Integer> values) {
+        public Criteria andScoreNotIn(List<BigDecimal> 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;
         }

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

@@ -59,4 +59,6 @@ public class CompeteExcelVo {
         @ApiModelProperty("月/日 上/下午")
         private String year;
     }
+
+
 }

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

@@ -179,4 +179,50 @@ public class ScoreVo {
 //        @ApiModelProperty("平均分")
 //        private BigDecimal aveScore;
 //    }
+
+    @Data
+    @ApiModel("返回项目配置信息")
+    public  static  class CompeteScore{
+        @ApiModelProperty("参赛id")
+        private Long projectId;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("参赛队伍")
+        private String companyName;
+        @ApiModelProperty("得分")
+        private String score;
+    }
+
+
+    @Data
+    @ApiModel("返回项目配置信息")
+    public  static  class CountScoreCurrentSite{
+        @ApiModelProperty("项目名")
+        private String projectName;
+        @ApiModelProperty("组别")
+        private String groupName;
+        @ApiModelProperty("团队名")
+        private String companyName;
+        @ApiModelProperty("场次")
+        private int competeOrder;
+        @ApiModelProperty("场地")
+        private int site;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("主裁打分")
+        private BigDecimal mainScore;
+        @ApiModelProperty("主裁1打分")
+        private BigDecimal mainOneScore;
+        @ApiModelProperty("主裁2打分")
+        private BigDecimal mainTwoScore;
+        @ApiModelProperty("应得分")
+        private BigDecimal shouldScore;
+        @ApiModelProperty("扣除次数")
+        private BigDecimal deductTime;
+        @ApiModelProperty("扣除原因")
+        private String deductReason;
+        @ApiModelProperty("最终成绩")
+        private BigDecimal finalScore;
+    }
+
 }

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

@@ -0,0 +1,27 @@
+package com.ccsens.mt.persist.dao;
+
+import com.ccsens.mt.bean.po.CompeteCoach;
+import com.ccsens.mt.bean.po.CompeteCompany;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
+import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
+import com.ccsens.mt.bean.vo.ScoreVo;
+import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Repository
+public interface CompeteScoreDao  {
+    List<ScoreVo.CompeteScore> selectSingleCount (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId);
+    List<ScoreVo.CompeteScore> selectGroupCount (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId);
+    List<ScoreVo.CompeteScore> selectSingleVarity(@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId);
+    List<ScoreVo.CompeteScore> selectGroupVarity (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId);
+    List<ScoreVo.CountScoreCurrentSite> selectCountScoreCurrentSite (@Param("siteId") long siteId);
+
+
+}

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<CompeteCountScore> selectByExample(CompeteCountScoreExample example);
 
-    CompeteCountScore selectByPrimaryKey(Long id);
+    CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key);
 
     int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example);
 

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

@@ -13,6 +13,7 @@ import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.LevelDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.bean.vo.ScoreVo;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
@@ -35,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.*;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -81,6 +83,10 @@ public class CompeteService implements ICompeteService {
     private CommonFileMapper commonFileMapper;
     @Resource
     private CompeteProjectConfigDao competeProjectConfigDao;
+    @Resource
+    private  CompeteScoreDao competeScoreDao;
+    @Resource
+    private  CompeteCountScoreMapper competeCountScoreMapper;
     /**
      * 查看第几届
      */
@@ -1047,31 +1053,77 @@ public class CompeteService implements ICompeteService {
     }
 
     @Override
-    public List<CompeteVo.CountScoreDetail> countScoreDetail(CompeteDto.ProjectIdAndGroupId params) {
+    public List<ScoreVo.CompeteScore> countScoreDetail(CompeteDto.ProjectIdAndGroupId params) {
+        List<ScoreVo.CompeteScore> competeScoreList = new ArrayList<>();
         //判断比赛类型
         long ProjectId = params.getProjectId();
-        long groupId = params.getGroupId();
+        long competeGroupId = params.getCompeteGroupId();
         CompeteProject competeProject  = competeProjectMapper.selectByPrimaryKey(ProjectId);
+        if (ObjectUtil.isNotNull(competeProject)){
         int team = competeProject.getTeam();
         long fatherId = competeProject.getParentId();
         //如果比赛是个人计数赛
         if (fatherId == 2001 && team == 0){
-            CompeteProjectPlayerExample competeProjectPlayerExample= new CompeteProjectPlayerExample();
+            List<ScoreVo.CompeteScore> competeScores = competeScoreDao.selectSingleCount(ProjectId, competeGroupId);
-            
+            competeScoreList.addAll(competeScores);
         }
         //如果是个人花样赛
         if (fatherId == 2002 && team == 0){
-
+            List<ScoreVo.CompeteScore> competeScores = competeScoreDao.selectSingleVarity(ProjectId, competeGroupId);
+            competeScoreList.addAll(competeScores);
         }
         //如果是团队计数赛
         if (fatherId == 2001 && team == 1){
-
+            List<ScoreVo.CompeteScore> competeScores = competeScoreDao.selectGroupCount(ProjectId, competeGroupId);
+            competeScoreList.addAll(competeScores);
         }
         //如果是团队花样赛
         if (fatherId == 2002 && team == 1){
-
+            List<ScoreVo.CompeteScore> competeScores = competeScoreDao.selectGroupVarity(ProjectId, competeGroupId);
+            competeScoreList.addAll(competeScores);
+        }
         }
-        return null;
+        return  competeScoreList;
+    }
+
+    @Override
+    public List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSite(CompeteDto.CompeteSite params) {
+        int siteId = params.getSiteId();
+        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId);
+        return countScoreCurrentSites;
+    }
+
+    @Override
+    public void submitScore(CompeteDto.SubmitScore params) {
+          long competeTimeId = params.getCompeteTimeId();
+          long projectId = params.getProjectId();
+          long siteOrderId = params.getSiteOrderId();
+          CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample();
+          competeCountScoreExample.createCriteria().
+                  andCompeteTimeIdEqualTo(competeTimeId).
+                  andProjectIdEqualTo(projectId).andSiteOrderIdEqualTo(siteOrderId).
+                  andSiteOrderIdEqualTo(params.getSiteOrderId()).
+                  andChiefJudgmentScoreEqualTo(params.getMainScore()).
+                  andJudgmentAScoreEqualTo(params.getMainOneScore()).
+                  andJudgmentBScore2EqualTo(params.getMainTwoScore()).
+                  andShouldTimesEqualTo(params.getShouldScore()).
+                  andDeductTimesEqualTo(params.getDeductTime()).
+                  andDeductCauseEqualTo(params.getDeductReason()).
+                  andFinalScoreEqualTo(params.getFinalScore()).
+                  andIdEqualTo(snowflake.nextId());
+        CompeteCountScore competeCountScore = new CompeteCountScore();
+        competeCountScore.setCompeteTimeId(competeTimeId);
+        competeCountScore.setProjectId(projectId);
+        competeCountScore.setSiteOrderId(siteOrderId);
+        competeCountScore.setChiefJudgmentScore(params.getMainScore());
+        competeCountScore.setJudgmentAScore(params.getMainOneScore());
+        competeCountScore.setJudgmentBScore2(params.getMainTwoScore());
+        competeCountScore.setShouldTimes(params.getShouldScore());
+        competeCountScore.setDeductTimes(params.getDeductTime());
+        competeCountScore.setDeductCause(params.getDeductReason());
+        competeCountScore.setFinalScore(params.getFinalScore());
+        competeCountScore.setId(snowflake.nextId());
+                competeCountScoreMapper.insert(competeCountScore);
     }
 
 

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

@@ -2,6 +2,7 @@ package com.ccsens.mt.service;
 
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.bean.vo.ScoreVo;
 import com.ccsens.util.bean.dto.QueryDto;
 
 import java.io.FileNotFoundException;
@@ -162,7 +163,23 @@ public interface ICompeteService {
      * @param params 大赛id和比赛项目id
      * @return 返回项目，开始时间和比赛状态
      */
-    List<CompeteVo.CountScoreDetail> countScoreDetail(CompeteDto.ProjectIdAndGroupId params) ;
+    List<ScoreVo.CompeteScore> countScoreDetail(CompeteDto.ProjectIdAndGroupId params) ;
+
+    /**
+     * 得分详情
+     * @param params 场次id
+     * @return 返回项目，开始时间和比赛状态
+     */
+    List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSite(CompeteDto.CompeteSite params) ;
+
+    /**
+     * 提交得分
+     * @param params 场次id
+     * @return 返回项目，开始时间和比赛状态
+     */
+    void submitScore(CompeteDto.SubmitScore params) ;
+
+
 
 
 }

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

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.mt.persist.dao.CompeteScoreDao">
+  <select id="selectSingleCount" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
+    SELECT
+    tcp.`name` as name,
+    tcc.`name` as companyName,
+    tccs.final_score as score
+    from
+    t_compete_project_player tcpp LEFT JOIN t_compete_player tcp ON tcpp.player_id = tcp.id
+    LEFT JOIN t_compete_start_order	tcso on tcso.player_id = tcpp.player_id
+    LEFT JOIN t_compete_count_score tccs on tccs.site_order_id = tcso.id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    WHERE tcpp.rec_status = 0
+    and tcp.rec_status=0
+    and tcso.rec_status=0
+    and tccs.rec_status=0
+    and tcc.rec_status = 0
+    and tcpp.project_id= #{projectId}
+    and tcpp.compete_group_id =#{competeGroupId}
+    GROUP BY tccs.final_score
+  </select>
+
+  <select id="selectGroupCount" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
+    SELECT
+    tccs.final_score as score,
+    tcc.`name` as companyName
+    from
+    t_compete_team tct LEFT JOIN t_compete_start_order tcso ON tct.id = tcso.player_id
+    LEFT JOIN t_compete_count_score tccs ON tccs.site_order_id = tcso.id
+    LEFT JOIN t_compete_company tcc on  tcc.id = tct.company_id
+    WHERE tct.rec_status = 0
+    and tcso.rec_status=0
+    and tccs.rec_status =0
+    and and tct.project_id= #{projectId}
+    and tct.compete_group_id =  #{competeGroupId}
+    GROUP BY tccs.final_score;
+  </select>
+
+  <select id="selectSingleVarity" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
+    SELECT
+    tcp.`name` as name,
+    tcc.`name` as companyName,
+    tcvs.score as  score
+
+    from
+    t_compete_project_player tcpp LEFT JOIN t_compete_player tcp ON tcpp.player_id = tcp.id
+    LEFT JOIN t_compete_start_order	tcso on tcso.player_id = tcpp.player_id
+    LEFT JOIN t_compete_variety_score tcvs on tcvs.site_order_id = tcso.id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    WHERE tcpp.rec_status = 0
+    and tcp.rec_status=0
+    and tcso.rec_status=0
+    and tcvs.rec_status=0
+    and tcc.rec_status = 0
+    and tcpp.project_id= #{projectId}
+    and tcpp.compete_group_id = #{competeGroupId}
+    GROUP BY tcvs.score
+  </select>
+  <select id="selectGroupVarity" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
+    SELECT
+    tcc.`name` as companyName,
+    tcvs.score as score
+    from
+    t_compete_team tct LEFT JOIN t_compete_start_order tcso ON tct.id = tcso.player_id
+    LEFT JOIN t_compete_variety_score tcvs ON tcvs.site_order_id = tcso.id
+    LEFT JOIN t_compete_company tcc on  tcc.id = tct.company_id
+    WHERE tct.rec_status = 0
+    and tcso.rec_status=0
+    and tcvs.rec_status =0
+    and and tct.project_id= #{projectId}
+    and tct.compete_group_id =  #{competeGroupId}
+    GROUP BY tcvs.score
+  </select>
+
+
+  <select id="selectCountScoreCurrentSite" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite" parameterType="java.util.Map">
+    SELECT
+    tcp.`name` as  name,
+    tcc.`name` as companyName,
+    tcg.group_name as groupName,
+    tcppro.`name` as projectName,
+    tcso.site as site,
+    tcso.compete_order as competeOrder,
+    tccs.chief_judgment_score as mainScore,
+    tccs.judgment_a_score as mainOneScore,
+    tccs.judgment_b_score2 as mainTwoScore,
+    tccs.should_times as shouldScore,
+    tccs.deduct_times as deductTime,
+    tccs.deduct_cause as deductReason,
+    tccs.final_score as finalScore
+    from
+    t_compete_start_order tcso LEFT JOIN t_compete_player tcp on tcso.player_id = tcp.id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+    LEFT JOIN t_compete_project tcppro on tcppro.id = tcso.project_id
+    LEFT JOIN t_compete_count_score  tccs on tccs.site_order_id = tcso.id
+    WHERE
+    tcso.rec_status=0
+    and tcp.rec_status=0
+    and tcc.rec_status=0
+    and tcg.rec_status=0
+    and tcppro.rec_status=0
+    and tccs.rec_status =0
+    and tcso.id =#{siteId}
+  </select>
+
+
+</mapper>

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

@@ -3,16 +3,16 @@
 <mapper namespace="com.ccsens.mt.persist.mapper.CompeteCountScoreMapper">
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteCountScore">
     <id column="id" jdbcType="BIGINT" property="id" />
+    <id column="should_times" jdbcType="INTEGER" property="shouldTimes" />
     <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
     <result column="site_order_id" jdbcType="BIGINT" property="siteOrderId" />
-    <result column="chief_judgment_score" jdbcType="BIGINT" property="chiefJudgmentScore" />
+    <result column="chief_judgment_score" jdbcType="DECIMAL" property="chiefJudgmentScore" />
-    <result column="judgment_a_score" jdbcType="INTEGER" property="judgmentAScore" />
+    <result column="judgment_a_score" jdbcType="DECIMAL" property="judgmentAScore" />
-    <result column="judgment_b_score2" jdbcType="INTEGER" property="judgmentBScore2" />
+    <result column="judgment_b_score2" jdbcType="DECIMAL" property="judgmentBScore2" />
-    <result column="should_times" jdbcType="INTEGER" property="shouldTimes" />
     <result column="deduct_times" jdbcType="INTEGER" property="deductTimes" />
     <result column="deduct_cause" jdbcType="VARCHAR" property="deductCause" />
-    <result column="final_score" jdbcType="INTEGER" property="finalScore" />
+    <result column="final_score" jdbcType="DECIMAL" property="finalScore" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -76,8 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, 
+    id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, 
-    judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, 
+    judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, 
     updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample" resultMap="BaseResultMap">
@@ -94,15 +94,17 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreKey" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from t_compete_count_score
     where id = #{id,jdbcType=BIGINT}
+      and should_times = #{shouldTimes,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+  <delete id="deleteByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreKey">
     delete from t_compete_count_score
     where id = #{id,jdbcType=BIGINT}
+      and should_times = #{shouldTimes,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample">
     delete from t_compete_count_score
@@ -111,15 +113,15 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
-    insert into t_compete_count_score (id, compete_time_id, project_id, 
+    insert into t_compete_count_score (id, should_times, compete_time_id, 
-      site_order_id, chief_judgment_score, judgment_a_score, 
+      project_id, site_order_id, chief_judgment_score, 
-      judgment_b_score2, should_times, deduct_times, 
+      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}, 
+    values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, 
-      #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, 
+      #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, 
-      #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, 
+      #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, 
-      #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, 
       #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
@@ -128,6 +130,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="shouldTimes != null">
+        should_times,
+      </if>
       <if test="competeTimeId != null">
         compete_time_id,
       </if>
@@ -146,9 +151,6 @@
       <if test="judgmentBScore2 != null">
         judgment_b_score2,
       </if>
-      <if test="shouldTimes != null">
-        should_times,
-      </if>
       <if test="deductTimes != null">
         deduct_times,
       </if>
@@ -172,6 +174,9 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
+      <if test="shouldTimes != null">
+        #{shouldTimes,jdbcType=INTEGER},
+      </if>
       <if test="competeTimeId != null">
         #{competeTimeId,jdbcType=BIGINT},
       </if>
@@ -182,16 +187,13 @@
         #{siteOrderId,jdbcType=BIGINT},
       </if>
       <if test="chiefJudgmentScore != null">
-        #{chiefJudgmentScore,jdbcType=BIGINT},
+        #{chiefJudgmentScore,jdbcType=DECIMAL},
       </if>
       <if test="judgmentAScore != null">
-        #{judgmentAScore,jdbcType=INTEGER},
+        #{judgmentAScore,jdbcType=DECIMAL},
       </if>
       <if test="judgmentBScore2 != null">
-        #{judgmentBScore2,jdbcType=INTEGER},
+        #{judgmentBScore2,jdbcType=DECIMAL},
-      </if>
-      <if test="shouldTimes != null">
-        #{shouldTimes,jdbcType=INTEGER},
       </if>
       <if test="deductTimes != null">
         #{deductTimes,jdbcType=INTEGER},
@@ -200,7 +202,7 @@
         #{deductCause,jdbcType=VARCHAR},
       </if>
       <if test="finalScore != null">
-        #{finalScore,jdbcType=INTEGER},
+        #{finalScore,jdbcType=DECIMAL},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -225,6 +227,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.shouldTimes != null">
+        should_times = #{record.shouldTimes,jdbcType=INTEGER},
+      </if>
       <if test="record.competeTimeId != null">
         compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       </if>
@@ -235,16 +240,13 @@
         site_order_id = #{record.siteOrderId,jdbcType=BIGINT},
       </if>
       <if test="record.chiefJudgmentScore != null">
-        chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT},
+        chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL},
       </if>
       <if test="record.judgmentAScore != null">
-        judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER},
+        judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL},
       </if>
       <if test="record.judgmentBScore2 != null">
-        judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER},
+        judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL},
-      </if>
-      <if test="record.shouldTimes != null">
-        should_times = #{record.shouldTimes,jdbcType=INTEGER},
       </if>
       <if test="record.deductTimes != null">
         deduct_times = #{record.deductTimes,jdbcType=INTEGER},
@@ -253,7 +255,7 @@
         deduct_cause = #{record.deductCause,jdbcType=VARCHAR},
       </if>
       <if test="record.finalScore != null">
-        final_score = #{record.finalScore,jdbcType=INTEGER},
+        final_score = #{record.finalScore,jdbcType=DECIMAL},
       </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -272,16 +274,16 @@
   <update id="updateByExample" parameterType="map">
     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},
+      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},
       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},
       </if>
       <if test="chiefJudgmentScore != null">
-        chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT},
+        chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL},
       </if>
       <if test="judgmentAScore != null">
-        judgment_a_score = #{judgmentAScore,jdbcType=INTEGER},
+        judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL},
       </if>
       <if test="judgmentBScore2 != null">
-        judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER},
+        judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL},
-      </if>
-      <if test="shouldTimes != null">
-        should_times = #{shouldTimes,jdbcType=INTEGER},
       </if>
       <if test="deductTimes != null">
         deduct_times = #{deductTimes,jdbcType=INTEGER},
@@ -320,7 +319,7 @@
         deduct_cause = #{deductCause,jdbcType=VARCHAR},
       </if>
       <if test="finalScore != null">
-        final_score = #{finalScore,jdbcType=INTEGER},
+        final_score = #{finalScore,jdbcType=DECIMAL},
       </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -333,22 +332,23 @@
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
+      and should_times = #{shouldTimes,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
     update t_compete_count_score
     set compete_time_id = #{competeTimeId,jdbcType=BIGINT},
       project_id = #{projectId,jdbcType=BIGINT},
       site_order_id = #{siteOrderId,jdbcType=BIGINT},
-      chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT},
+      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},
       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}
   </update>
 </mapper>

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

@@ -7,7 +7,7 @@
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
     <result column="site_order_id" jdbcType="BIGINT" property="siteOrderId" />
     <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="score" jdbcType="INTEGER" property="score" />
+    <result column="score" jdbcType="DECIMAL" property="score" />
     <result column="judgment_id" jdbcType="BIGINT" property="judgmentId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -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})
   </insert>
@@ -166,7 +166,7 @@
         #{code,jdbcType=VARCHAR},
       </if>
       <if test="score != null">
-        #{score,jdbcType=INTEGER},
+        #{score,jdbcType=DECIMAL},
       </if>
       <if test="judgmentId != null">
         #{judgmentId,jdbcType=BIGINT},
@@ -207,7 +207,7 @@
         code = #{record.code,jdbcType=VARCHAR},
       </if>
       <if test="record.score != null">
-        score = #{record.score,jdbcType=INTEGER},
+        score = #{record.score,jdbcType=DECIMAL},
       </if>
       <if test="record.judgmentId != null">
         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},
       </if>
       <if test="score != null">
-        score = #{score,jdbcType=INTEGER},
+        score = #{score,jdbcType=DECIMAL},
       </if>
       <if test="judgmentId != null">
         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},