修改提交得信息

mt/src/main/java/com/ccsens/mt/bean/po/CompeteOrderRemark.java

@@ -0,0 +1,95 @@
+package com.ccsens.mt.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CompeteOrderRemark implements Serializable {
+    private Long id;
+
+    private Long startOrderId;
+
+    private Long judgmentId;
+
+    private String description;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getStartOrderId() {
+        return startOrderId;
+    }
+
+    public void setStartOrderId(Long startOrderId) {
+        this.startOrderId = startOrderId;
+    }
+
+    public Long getJudgmentId() {
+        return judgmentId;
+    }
+
+    public void setJudgmentId(Long judgmentId) {
+        this.judgmentId = judgmentId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @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(", startOrderId=").append(startOrderId);
+        sb.append(", judgmentId=").append(judgmentId);
+        sb.append(", description=").append(description);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

mt/src/main/java/com/ccsens/mt/bean/po/CompeteOrderRemarkExample.java

@@ -0,0 +1,631 @@
+package com.ccsens.mt.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CompeteOrderRemarkExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CompeteOrderRemarkExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdIsNull() {
+            addCriterion("start_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdIsNotNull() {
+            addCriterion("start_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdEqualTo(Long value) {
+            addCriterion("start_order_id =", value, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdNotEqualTo(Long value) {
+            addCriterion("start_order_id <>", value, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdGreaterThan(Long value) {
+            addCriterion("start_order_id >", value, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("start_order_id >=", value, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdLessThan(Long value) {
+            addCriterion("start_order_id <", value, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdLessThanOrEqualTo(Long value) {
+            addCriterion("start_order_id <=", value, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdIn(List<Long> values) {
+            addCriterion("start_order_id in", values, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdNotIn(List<Long> values) {
+            addCriterion("start_order_id not in", values, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdBetween(Long value1, Long value2) {
+            addCriterion("start_order_id between", value1, value2, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartOrderIdNotBetween(Long value1, Long value2) {
+            addCriterion("start_order_id not between", value1, value2, "startOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdIsNull() {
+            addCriterion("judgment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdIsNotNull() {
+            addCriterion("judgment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdEqualTo(Long value) {
+            addCriterion("judgment_id =", value, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdNotEqualTo(Long value) {
+            addCriterion("judgment_id <>", value, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdGreaterThan(Long value) {
+            addCriterion("judgment_id >", value, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("judgment_id >=", value, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdLessThan(Long value) {
+            addCriterion("judgment_id <", value, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("judgment_id <=", value, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdIn(List<Long> values) {
+            addCriterion("judgment_id in", values, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdNotIn(List<Long> values) {
+            addCriterion("judgment_id not in", values, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdBetween(Long value1, Long value2) {
+            addCriterion("judgment_id between", value1, value2, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudgmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("judgment_id not between", value1, value2, "judgmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNull() {
+            addCriterion("description is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNotNull() {
+            addCriterion("description is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionEqualTo(String value) {
+            addCriterion("description =", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotEqualTo(String value) {
+            addCriterion("description <>", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThan(String value) {
+            addCriterion("description >", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("description >=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThan(String value) {
+            addCriterion("description <", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThanOrEqualTo(String value) {
+            addCriterion("description <=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLike(String value) {
+            addCriterion("description like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotLike(String value) {
+            addCriterion("description not like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIn(List<String> values) {
+            addCriterion("description in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotIn(List<String> values) {
+            addCriterion("description not in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionBetween(String value1, String value2) {
+            addCriterion("description between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotBetween(String value1, String value2) {
+            addCriterion("description not between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteOrderRemarkMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.mt.persist.mapper;
+
+import com.ccsens.mt.bean.po.CompeteOrderRemark;
+import com.ccsens.mt.bean.po.CompeteOrderRemarkExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CompeteOrderRemarkMapper {
+    long countByExample(CompeteOrderRemarkExample example);
+
+    int deleteByExample(CompeteOrderRemarkExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(CompeteOrderRemark record);
+
+    int insertSelective(CompeteOrderRemark record);
+
+    List<CompeteOrderRemark> selectByExample(CompeteOrderRemarkExample example);
+
+    CompeteOrderRemark selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") CompeteOrderRemark record, @Param("example") CompeteOrderRemarkExample example);
+
+    int updateByExample(@Param("record") CompeteOrderRemark record, @Param("example") CompeteOrderRemarkExample example);
+
+    int updateByPrimaryKeySelective(CompeteOrderRemark record);
+
+    int updateByPrimaryKey(CompeteOrderRemark record);
+}

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

@@ -104,6 +104,8 @@ public class CompeteService implements ICompeteService {
     private CompeteJudgmentMapper competeJudgmentMapper;
     @Resource
     private CompeteVideoMapper competeVideoMapper;
+    @Resource
+    private CompeteOrderRemarkMapper competeOrderRemarkMapper;
 
 
     @Override
@@ -1169,29 +1171,46 @@ public class CompeteService implements ICompeteService {
                 CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample();
                 competeVarietyScoreExample.createCriteria().andRecStatusEqualTo((byte)0).andSiteOrderIdEqualTo(param.getSiteOrderId());
                 List<CompeteVarietyScore> competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample);
-                for (int i = 0; i < competeVarietyScoresList.size(); i++) {
-                    competeVarietyScoresList.get(i).setScore(new BigDecimal(0));
-                    competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScoresList.get(i));
+                if(competeVarietyScoresList.size()>0){
+                    for (int i = 0; i < competeVarietyScoresList.size(); i++) {
+                        competeVarietyScoresList.get(i).setScore(new BigDecimal(0));
+                        competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScoresList.get(i));
+                    }
                 }
             }
-        }
-        param.getFractionsList().forEach(mes->{
-            if(StringUtils.isNotBlank(param.getRemark())){
-                CompeteStartOrder competeStartOrder=new CompeteStartOrder();
-                competeStartOrder.setId(param.getSiteOrderId());
-                competeStartOrder.setRemark(param.getRemark());
-                competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
+            //修改提交弃权那些
+            if(!param.getWaiver().equals(competeStartOrder1.getWaiver())){
+                competeStartOrder1.setWaiver(param.getWaiver());
+                competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder1);
             }
-            CompeteStartOrder competeStartOrder=new CompeteStartOrder();
-            competeStartOrder.setId(param.getSiteOrderId());
-            competeStartOrder.setWaiver(param.getWaiver());
-            competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
-            if(param.getWaiver()!=((byte)0)){
-                for (int i = 0; i < param.getFractionsList().size(); i++) {
-                    param.getFractionsList().get(i).setScore(new BigDecimal(0));
+        }
+        if(StringUtils.isNotBlank(param.getRemark())) {
+            //提交和验证备注
+            CompeteOrderRemarkExample competeOrderRemarkExample = new CompeteOrderRemarkExample();
+            competeOrderRemarkExample.createCriteria().andJudgmentIdEqualTo(param.getJudgmentId()).andStartOrderIdEqualTo(param.getSiteOrderId()).andRecStatusEqualTo((byte) 0);
+            List<CompeteOrderRemark> competeOrderRemarks = competeOrderRemarkMapper.selectByExample(competeOrderRemarkExample);
+            if (competeOrderRemarks.size() > 0) {
+                //更改
+                if(!param.getRemark().equals(competeOrderRemarks.get(0).getDescription())){
+                    competeOrderRemarks.get(0).setDescription(param.getRemark());
+                    competeOrderRemarkMapper.updateByPrimaryKeySelective(competeOrderRemarks.get(0));
                 }
+            }else {
+                //提交
+                CompeteOrderRemark competeOrderRemark=new CompeteOrderRemark();
+                competeOrderRemark.setId(snowflake.nextId());
+                competeOrderRemark.setStartOrderId(param.getSiteOrderId());
+                competeOrderRemark.setDescription(param.getRemark());
+                competeOrderRemark.setJudgmentId(param.getJudgmentId());
+                competeOrderRemarkMapper.insertSelective(competeOrderRemark);
             }
-
+        }
+        if(competeStartOrder1.getWaiver()!=((byte)0)){
+            for (int i = 0; i < param.getFractionsList().size(); i++) {
+                param.getFractionsList().get(i).setScore(new BigDecimal(0));
+            }
+        }
+        param.getFractionsList().forEach(mes->{
             CompeteVarietyScore competeVarietyScore=new CompeteVarietyScore();
             competeVarietyScore.setCompeteTimeId(param.getCompeteTimeId());
             competeVarietyScore.setProjectId(param.getProjectId());
@@ -1213,9 +1232,6 @@ public class CompeteService implements ICompeteService {
 
     }
 
-
-
-
     /**
      * 验证数据的正确性，存入数据库
      */
@@ -1718,8 +1734,14 @@ public class CompeteService implements ICompeteService {
             selScropeVo.setProjectName(competeProject.getName());
         }
         //备注
-        if(StringUtils.isNotBlank(competeStartOrder1.getRemark())){
-            selScropeVo.setRemark(competeStartOrder1.getRemark());
+        CompeteOrderRemarkExample competeOrderRemarkExample=new CompeteOrderRemarkExample();
+        competeOrderRemarkExample.createCriteria().andStartOrderIdEqualTo(param.getSiteOrderId()).andJudgmentIdEqualTo(param.getJudgmentId()).andRecStatusEqualTo((byte)0);
+        List<CompeteOrderRemark> competeOrderRemarks = competeOrderRemarkMapper.selectByExample(competeOrderRemarkExample);
+        if(competeOrderRemarks.size()>0){
+            if(StringUtils.isNotEmpty(competeOrderRemarks.get(0).getDescription())){
+                selScropeVo.setRemark(competeOrderRemarks.get(0).getDescription());
+            }
+
         }
         //场地信息
         selScropeVo.setSite(competeStartOrder1.getSite());
@@ -1757,6 +1779,8 @@ public class CompeteService implements ICompeteService {
 }
             * */
         }else {
+
+
             CompeteTeam competeTeam = competeTeamMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId());
            if(competeProject.getJoinRule()==(byte)1){
                selScropeVo.setGroupName("不限组别");

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

@@ -72,7 +72,9 @@ public class CompeteVedioService implements ICompeteVedioService{
         competeVideoExample.createCriteria().andProjectIdEqualTo(param.getCompeteProjectId()).andPlayerIdEqualTo(param.getPlayerOrTeamId()).andRecStatusEqualTo((byte)0);
         List<CompeteVideo> competeVideos = competeVideoMapper.selectByExample(competeVideoExample);
         if(competeVideos.size()>0){
-            return competeVideos.get(0).getVideoUrl();
+            competeVideos.get(0).setVideoUrl(param.getVideoPath());
+            competeVideoMapper.updateByPrimaryKeySelective(competeVideos.get(0));
+            return param.getVideoPath();
         }
         CompeteVideo competeVideo=new CompeteVideo();
         competeVideo.setId(snowflake.nextId());

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

@@ -0,0 +1,243 @@
+<?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.mapper.CompeteOrderRemarkMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteOrderRemark">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="start_order_id" jdbcType="BIGINT" property="startOrderId" />
+    <result column="judgment_id" jdbcType="BIGINT" property="judgmentId" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, start_order_id, judgment_id, description, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemarkExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_compete_order_remark
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_compete_order_remark
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_compete_order_remark
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemarkExample">
+    delete from t_compete_order_remark
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemark">
+    insert into t_compete_order_remark (id, start_order_id, judgment_id, 
+      description, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{startOrderId,jdbcType=BIGINT}, #{judgmentId,jdbcType=BIGINT}, 
+      #{description,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemark">
+    insert into t_compete_order_remark
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="startOrderId != null">
+        start_order_id,
+      </if>
+      <if test="judgmentId != null">
+        judgment_id,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="startOrderId != null">
+        #{startOrderId,jdbcType=BIGINT},
+      </if>
+      <if test="judgmentId != null">
+        #{judgmentId,jdbcType=BIGINT},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemarkExample" resultType="java.lang.Long">
+    select count(*) from t_compete_order_remark
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_compete_order_remark
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.startOrderId != null">
+        start_order_id = #{record.startOrderId,jdbcType=BIGINT},
+      </if>
+      <if test="record.judgmentId != null">
+        judgment_id = #{record.judgmentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_compete_order_remark
+    set id = #{record.id,jdbcType=BIGINT},
+      start_order_id = #{record.startOrderId,jdbcType=BIGINT},
+      judgment_id = #{record.judgmentId,jdbcType=BIGINT},
+      description = #{record.description,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemark">
+    update t_compete_order_remark
+    <set>
+      <if test="startOrderId != null">
+        start_order_id = #{startOrderId,jdbcType=BIGINT},
+      </if>
+      <if test="judgmentId != null">
+        judgment_id = #{judgmentId,jdbcType=BIGINT},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteOrderRemark">
+    update t_compete_order_remark
+    set start_order_id = #{startOrderId,jdbcType=BIGINT},
+      judgment_id = #{judgmentId,jdbcType=BIGINT},
+      description = #{description,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>