diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index 8fff9c05..918c56c5 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -75,7 +75,6 @@ public class ExcelController { return JsonResponse.newInstance().ok(path); } - @MustLogin @ApiOperation(value = "大赛参赛队伍信息表", notes = "") @RequestMapping(value = "/competitionTeamInformationTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java index d89e1feb..bd87e822 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -4,7 +4,9 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -public class CompeteCountScore extends CompeteCountScoreKey implements Serializable { +public class CompeteCountScore implements Serializable { + private Long id; + private Long competeTimeId; private Long projectId; @@ -17,6 +19,8 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa private BigDecimal judgmentBScore2; + private Integer shouldTimes; + private Integer deductTimes; private String deductCause; @@ -31,6 +35,14 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa private static final long serialVersionUID = 1L; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public Long getCompeteTimeId() { return competeTimeId; } @@ -79,6 +91,14 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa this.judgmentBScore2 = judgmentBScore2; } + public Integer getShouldTimes() { + return shouldTimes; + } + + public void setShouldTimes(Integer shouldTimes) { + this.shouldTimes = shouldTimes; + } + public Integer getDeductTimes() { return deductTimes; } @@ -133,12 +153,14 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa sb.append(getClass().getSimpleName()); sb.append(" ["); sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", projectId=").append(projectId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", chiefJudgmentScore=").append(chiefJudgmentScore); sb.append(", judgmentAScore=").append(judgmentAScore); sb.append(", judgmentBScore2=").append(judgmentBScore2); + sb.append(", shouldTimes=").append(shouldTimes); sb.append(", deductTimes=").append(deductTimes); sb.append(", deductCause=").append(deductCause); sb.append(", finalScore=").append(finalScore); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java index c72f3961..f7572afa 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -166,66 +166,6 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andShouldTimesIsNull() { - addCriterion("should_times is null"); - return (Criteria) this; - } - - public Criteria andShouldTimesIsNotNull() { - addCriterion("should_times is not null"); - return (Criteria) this; - } - - public Criteria andShouldTimesEqualTo(Integer value) { - addCriterion("should_times =", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotEqualTo(Integer value) { - addCriterion("should_times <>", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThan(Integer value) { - addCriterion("should_times >", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { - addCriterion("should_times >=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThan(Integer value) { - addCriterion("should_times <", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { - addCriterion("should_times <=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesIn(List values) { - addCriterion("should_times in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotIn(List values) { - addCriterion("should_times not in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesBetween(Integer value1, Integer value2) { - addCriterion("should_times between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { - addCriterion("should_times not between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; @@ -586,6 +526,66 @@ public class CompeteCountScoreExample { return (Criteria) this; } + public Criteria andShouldTimesIsNull() { + addCriterion("should_times is null"); + return (Criteria) this; + } + + public Criteria andShouldTimesIsNotNull() { + addCriterion("should_times is not null"); + return (Criteria) this; + } + + public Criteria andShouldTimesEqualTo(Integer value) { + addCriterion("should_times =", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotEqualTo(Integer value) { + addCriterion("should_times <>", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThan(Integer value) { + addCriterion("should_times >", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("should_times >=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThan(Integer value) { + addCriterion("should_times <", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + addCriterion("should_times <=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesIn(List values) { + addCriterion("should_times in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotIn(List values) { + addCriterion("should_times not in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + addCriterion("should_times between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + addCriterion("should_times not between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + public Criteria andDeductTimesIsNull() { addCriterion("deduct_times is null"); return (Criteria) this; diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java index 5592b7ec..faf0e354 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java @@ -2,7 +2,6 @@ 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; @@ -11,7 +10,7 @@ public interface CompeteCountScoreMapper { int deleteByExample(CompeteCountScoreExample example); - int deleteByPrimaryKey(CompeteCountScoreKey key); + int deleteByPrimaryKey(Long id); int insert(CompeteCountScore record); @@ -19,7 +18,7 @@ public interface CompeteCountScoreMapper { List selectByExample(CompeteCountScoreExample example); - CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key); + CompeteCountScore selectByPrimaryKey(Long id); int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java index 302b3a7a..4f880607 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java @@ -25,7 +25,6 @@ public class CompeteScoreService implements ICompeteScoreService{ private CompeteCountScoreMapper competeCountScoreMapper; @Resource private Snowflake snowflake; - @Override public void submitScore(CompeteDto.SubmitScore param) { //查找该场次已经有的分数 diff --git a/mt/src/main/resources/logback-spring.xml b/mt/src/main/resources/logback-spring.xml index da37f156..bdd2a4ea 100644 --- a/mt/src/main/resources/logback-spring.xml +++ b/mt/src/main/resources/logback-spring.xml @@ -1,4 +1,4 @@ - + diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 6f586d68..f562ef5f 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,13 +3,13 @@ - + @@ -76,8 +76,8 @@ - id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, - judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, + id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, + judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -113,14 +111,14 @@ - insert into t_compete_count_score (id, should_times, compete_time_id, - project_id, site_order_id, chief_judgment_score, - judgment_a_score, judgment_b_score2, deduct_times, + insert into t_compete_count_score (id, compete_time_id, project_id, + site_order_id, chief_judgment_score, judgment_a_score, + judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, - #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, #{judgmentAScore,jdbcType=DECIMAL}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -130,9 +128,6 @@ id, - - should_times, - compete_time_id, @@ -151,6 +146,9 @@ judgment_b_score2, + + should_times, + deduct_times, @@ -174,9 +172,6 @@ #{id,jdbcType=BIGINT}, - - #{shouldTimes,jdbcType=INTEGER}, - #{competeTimeId,jdbcType=BIGINT}, @@ -195,6 +190,9 @@ #{judgmentBScore2,jdbcType=DECIMAL}, + + #{shouldTimes,jdbcType=INTEGER}, + #{deductTimes,jdbcType=INTEGER}, @@ -227,9 +225,6 @@ id = #{record.id,jdbcType=BIGINT}, - - should_times = #{record.shouldTimes,jdbcType=INTEGER}, - compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -248,6 +243,9 @@ judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, @@ -274,13 +272,13 @@ 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=DECIMAL}, judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, 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=DECIMAL}, @@ -312,6 +310,9 @@ judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, + + should_times = #{shouldTimes,jdbcType=INTEGER}, + deduct_times = #{deductTimes,jdbcType=INTEGER}, @@ -332,7 +333,6 @@ where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score @@ -342,6 +342,7 @@ chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, 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=DECIMAL}, @@ -349,6 +350,5 @@ updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file