修改分数类型

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

@@ -40,5 +40,4 @@ public class CompeteScoreController {
 
 
 
-
 }

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<VideoDto.UploadVdeo> params) {
-        //这个没写完了
+    public JsonResponse<List<VideoProjectVo.PeoSignStatu>> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTeamSignStatu> params) {
 
-        log.info("添加用户观看开幕式视频记录（签到用）",params);
 
-        return JsonResponse.newInstance().ok();
+        log.info("查看单位签到状态（签到用）",params);
+        List<VideoProjectVo.PeoSignStatu> 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<List<VideoProjectVo.CoachSignStatu>> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTeamSignStatu> params) {
+
+
+        log.info("查看教练签到状态（签到用）",params);
+        List<VideoProjectVo.CoachSignStatu> coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params);
+        return JsonResponse.newInstance().ok(coachSignStatus);
     }
 
     @MustLogin
@@ -84,8 +94,8 @@ public class CompeteVedioController {
         log.info("添加用户观看开幕式视频记录（签到用）",params);
         List<VideoProjectVo.GetAllCompany> list=iCompeteVedioService.selectAllCompany(params);
         return JsonResponse.newInstance().ok(list);
-
     }
 
 
+
 }

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<Fraction>
+
+    }
+    @Data
+    @ApiModel
+    public static class Fraction{
+        @ApiModelProperty("分数")
+        private int score;
+        @ApiModelProperty("分数类型")
+        private String code;
+
+
+
+
+    }
+
+
 }

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

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

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<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 +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<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,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<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;
         }
@@ -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<Integer> values) {
+        public Criteria andShouldTimesIn(List<BigDecimal> values) {
             addCriterion("should_times in", values, "shouldTimes");
             return (Criteria) this;
         }
 
-        public Criteria andShouldTimesNotIn(List<Integer> values) {
+        public Criteria andShouldTimesNotIn(List<BigDecimal> 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<Integer> values) {
+        public Criteria andDeductTimesIn(List<BigDecimal> values) {
             addCriterion("deduct_times in", values, "deductTimes");
             return (Criteria) this;
         }
 
-        public Criteria andDeductTimesNotIn(List<Integer> values) {
+        public Criteria andDeductTimesNotIn(List<BigDecimal> 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<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/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);

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<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> 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<String> values) {
+            addCriterion("phone in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotIn(List<String> 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<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> 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;

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

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<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param);
+
+    List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param);
+}

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<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetTeamSignStatu> params) {
+        return competeVideoDao.selectCompanySignStatus(params.getParam());
+    }
+    /**
+     * 查看教练的签到状态
+     * @param params
+     * @return
+     */
+    @Override
+    public List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetTeamSignStatu> params) {
+        log.info(params.getParam().toString());
+        return competeVideoDao.selectCoachSignStatus(params.getParam());
+    }
+
+
+
 }

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

@@ -27,4 +27,8 @@ public interface ICompeteVedioService {
     List<VideoProjectVo.GetTwoProject> selectTwoProject(QueryDto<VideoDto.GetTwoProject> params);
 
     List<VideoProjectVo.GetAllCompany> selectAllCompany(QueryDto<VideoDto.GetAllCompany> params);
+
+    List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetTeamSignStatu> params);
+
+    List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetTeamSignStatu> params);
 }

mt/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev
 

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

@@ -0,0 +1,63 @@
+<?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.CompeteVideoDao">
+
+    <select id="selectCompanySignStatus" parameterType="com.ccsens.mt.bean.dto.VideoDto$GetTeamSignStatu" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$PeoSignStatu">
+    select
+      tcc.name as name,
+      tcc.`contacts_phone` as phone,
+      tcpl.`look_time` as `time`
+    from
+      t_compete_company tcc
+    LEFT JOIN t_compete_time tct on tct.id=tcc.compete_time_id
+    LEFT JOIN (
+       select company_id,max(look_time) as `look_time`
+       FROM t_compete_player_look
+       where `rec_status`=0
+       <if test="param.signEndTime!=null">
+        and  t_compete_player_look.`look_time` &lt;= #{param.signEndTime}
+       </if>
+    ) tcpl on tcpl.company_id=tcc.id
+    where
+    tct.id= #{param.id}
+    <if test="param.name!=null">
+        and tcc.`name`=#{param.name}
+    </if>
+    <if test="param.phone!=null">
+        and tcc.`contacts_name`=#{param.phone}
+    </if>
+    and tcc.`rec_status`=0
+    and tct.`rec_status`=0
+    </select>
+    <select id="selectCoachSignStatus" parameterType="com.ccsens.mt.bean.dto.VideoDto$GetTeamSignStatu" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$CoachSignStatu" >
+       select
+        tcj.`name` as `name`,
+        tcj.`phone` as `phone`,
+        tcj.`chief_judgment` as `chiefJudgment`,
+        tt.`cr` as `time`
+       FROM
+        t_compete_judgment tcj
+        left join (
+        select
+         max(created_at) as cr,
+         user_id
+         From tall.t_sys_log
+         where `url`='/users/signin' and `rec_status`=0
+        <if test="param.signEndTime!=null">
+            and  tall.t_sys_log.created_at &lt;= #{param.signEndTime}
+        </if>
+        ) tt on tt.`user_id`=tcj.`user_id`
+        LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id`
+        WHERE
+        tct.id=#{param.id}
+        <if test="param.name!=null">
+         and tcj.`name`=#{param.name}
+        </if>
+        <if test="param.phone!=null">
+         and tcj.`phone`=#{param.phone}
+        </if>
+        and tcj.`rec_status`=0
+        and tct.`rec_status`=0
+
+    </select>
+</mapper>

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

@@ -6,13 +6,13 @@
     <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="judgment_a_score" jdbcType="INTEGER" property="judgmentAScore" />
-    <result column="judgment_b_score2" jdbcType="INTEGER" property="judgmentBScore2" />
-    <result column="should_times" jdbcType="INTEGER" property="shouldTimes" />
-    <result column="deduct_times" jdbcType="INTEGER" property="deductTimes" />
+    <result column="chief_judgment_score" jdbcType="DECIMAL" property="chiefJudgmentScore" />
+    <result column="judgment_a_score" jdbcType="DECIMAL" property="judgmentAScore" />
+    <result column="judgment_b_score2" jdbcType="DECIMAL" property="judgmentBScore2" />
+    <result column="should_times" jdbcType="DECIMAL" property="shouldTimes" />
+    <result column="deduct_times" jdbcType="DECIMAL" 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" />
@@ -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})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
@@ -182,25 +182,25 @@
         #{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},
+        #{shouldTimes,jdbcType=DECIMAL},
       </if>
       <if test="deductTimes != null">
-        #{deductTimes,jdbcType=INTEGER},
+        #{deductTimes,jdbcType=DECIMAL},
       </if>
       <if test="deductCause != null">
         #{deductCause,jdbcType=VARCHAR},
       </if>
       <if test="finalScore != null">
-        #{finalScore,jdbcType=INTEGER},
+        #{finalScore,jdbcType=DECIMAL},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -235,25 +235,25 @@
         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},
+        should_times = #{record.shouldTimes,jdbcType=DECIMAL},
       </if>
       <if test="record.deductTimes != null">
-        deduct_times = #{record.deductTimes,jdbcType=INTEGER},
+        deduct_times = #{record.deductTimes,jdbcType=DECIMAL},
       </if>
       <if test="record.deductCause != null">
         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},
@@ -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},
       </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},
+        should_times = #{shouldTimes,jdbcType=DECIMAL},
       </if>
       <if test="deductTimes != null">
-        deduct_times = #{deductTimes,jdbcType=INTEGER},
+        deduct_times = #{deductTimes,jdbcType=DECIMAL},
       </if>
       <if test="deductCause != null">
         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},
@@ -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}

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

@@ -3,6 +3,9 @@
 <mapper namespace="com.ccsens.mt.persist.mapper.CompeteJudgmentMapper">
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteJudgment">
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
     <result column="site_order_id" jdbcType="BIGINT" property="siteOrderId" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
@@ -71,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    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
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteJudgmentExample" resultMap="BaseResultMap">
     select
@@ -105,11 +108,13 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteJudgment">
-    insert into t_compete_judgment (id, compete_time_id, site_order_id, 
+    insert into t_compete_judgment (id, name, phone, 
+      remark, compete_time_id, site_order_id, 
       project_id, user_id, chief_judgment, 
       created_at, updated_at, rec_status
       )
-    values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, 
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{competeTimeId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, 
       #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{chiefJudgment,jdbcType=TINYINT}, 
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
       )
@@ -120,6 +125,15 @@
       <if test="id != null">
         id,
       </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
       <if test="competeTimeId != null">
         compete_time_id,
       </if>
@@ -149,6 +163,15 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
       <if test="competeTimeId != null">
         #{competeTimeId,jdbcType=BIGINT},
       </if>
@@ -187,6 +210,15 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
       <if test="record.competeTimeId != null">
         compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       </if>
@@ -219,6 +251,9 @@
   <update id="updateByExample" parameterType="map">
     update t_compete_judgment
     set id = #{record.id,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
       compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       site_order_id = #{record.siteOrderId,jdbcType=BIGINT},
       project_id = #{record.projectId,jdbcType=BIGINT},
@@ -234,6 +269,15 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.mt.bean.po.CompeteJudgment">
     update t_compete_judgment
     <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
       <if test="competeTimeId != null">
         compete_time_id = #{competeTimeId,jdbcType=BIGINT},
       </if>
@@ -263,7 +307,10 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteJudgment">
     update t_compete_judgment
-    set compete_time_id = #{competeTimeId,jdbcType=BIGINT},
+    set name = #{name,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      compete_time_id = #{competeTimeId,jdbcType=BIGINT},
       site_order_id = #{siteOrderId,jdbcType=BIGINT},
       project_id = #{projectId,jdbcType=BIGINT},
       user_id = #{userId,jdbcType=BIGINT},

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