Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java

@@ -135,4 +135,13 @@ public class MemberRoleDto {
         @ApiModelProperty("token")
         private String token;
     }
+
+    @Data
+    @ApiModel("给角色添加成员")
+    public static class DeleteRole{
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("token")
+        private String token;
+    }
 }

cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@@ -220,6 +220,11 @@ public interface TallFeignClient {
      */
     @RequestMapping("/roles/saveMember")
     JsonResponse saveMemberInRole(MemberRoleDto.SaveMemberInRole saveMember);
+    /**
+     * 将成员从角色内删除
+     */
+    @RequestMapping("/roles/deleteMember")
+    JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember);
 
 
     /**
@@ -227,6 +232,12 @@ public interface TallFeignClient {
      */
     @RequestMapping("/members/query/memberByPhone")
     JsonResponse<MemberVo.MemberList> queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone);
+
+    /**
+     * 删除角色
+     */
+    @RequestMapping("/roles/delete")
+    JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole);
 }
 
 @Slf4j
@@ -375,10 +386,20 @@ class TallFeignClientFallBack implements FallbackFactory<TallFeignClient> {
                 return JsonResponse.newInstance().fail();
             }
 
+            @Override
+            public JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember) {
+                return JsonResponse.newInstance().fail();
+            }
+
             @Override
             public JsonResponse<MemberVo.MemberList> queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone) {
                 return JsonResponse.newInstance().fail();
             }
+
+            @Override
+            public JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole) {
+                return JsonResponse.newInstance().fail();
+            }
         };
     }
 

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

@@ -130,7 +130,7 @@ public class ScoreDto {
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("当前页")
-        private int page=1;
+        private int pageNum=1;
         @ApiModelProperty("每页数量")
         private  int size=10;
     }

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/bean/po/Constant.java

@@ -0,0 +1,128 @@
+package com.ccsens.mt.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Constant implements Serializable {
+    private Long id;
+
+    private Long projectId;
+
+    private Long businessId;
+
+    private Byte businessType;
+
+    private String tKey;
+
+    private String tValue;
+
+    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 getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public Long getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(Long businessId) {
+        this.businessId = businessId;
+    }
+
+    public Byte getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Byte businessType) {
+        this.businessType = businessType;
+    }
+
+    public String gettKey() {
+        return tKey;
+    }
+
+    public void settKey(String tKey) {
+        this.tKey = tKey == null ? null : tKey.trim();
+    }
+
+    public String gettValue() {
+        return tValue;
+    }
+
+    public void settValue(String tValue) {
+        this.tValue = tValue == null ? null : tValue.trim();
+    }
+
+    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(", projectId=").append(projectId);
+        sb.append(", businessId=").append(businessId);
+        sb.append(", businessType=").append(businessType);
+        sb.append(", tKey=").append(tKey);
+        sb.append(", tValue=").append(tValue);
+        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/ConstantExample.java

@@ -0,0 +1,831 @@
+package com.ccsens.mt.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ConstantExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ConstantExample() {
+        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 andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(Long value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(Long value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(Long value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(Long value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(Long value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<Long> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<Long> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(Long value1, Long value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(Long value1, Long value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIsNull() {
+            addCriterion("business_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIsNotNull() {
+            addCriterion("business_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdEqualTo(Long value) {
+            addCriterion("business_id =", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotEqualTo(Long value) {
+            addCriterion("business_id <>", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdGreaterThan(Long value) {
+            addCriterion("business_id >", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("business_id >=", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLessThan(Long value) {
+            addCriterion("business_id <", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLessThanOrEqualTo(Long value) {
+            addCriterion("business_id <=", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIn(List<Long> values) {
+            addCriterion("business_id in", values, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotIn(List<Long> values) {
+            addCriterion("business_id not in", values, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdBetween(Long value1, Long value2) {
+            addCriterion("business_id between", value1, value2, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotBetween(Long value1, Long value2) {
+            addCriterion("business_id not between", value1, value2, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeIsNull() {
+            addCriterion("business_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeIsNotNull() {
+            addCriterion("business_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeEqualTo(Byte value) {
+            addCriterion("business_type =", value, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeNotEqualTo(Byte value) {
+            addCriterion("business_type <>", value, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeGreaterThan(Byte value) {
+            addCriterion("business_type >", value, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("business_type >=", value, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeLessThan(Byte value) {
+            addCriterion("business_type <", value, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("business_type <=", value, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeIn(List<Byte> values) {
+            addCriterion("business_type in", values, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeNotIn(List<Byte> values) {
+            addCriterion("business_type not in", values, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeBetween(Byte value1, Byte value2) {
+            addCriterion("business_type between", value1, value2, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("business_type not between", value1, value2, "businessType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyIsNull() {
+            addCriterion("t_key is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyIsNotNull() {
+            addCriterion("t_key is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyEqualTo(String value) {
+            addCriterion("t_key =", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyNotEqualTo(String value) {
+            addCriterion("t_key <>", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyGreaterThan(String value) {
+            addCriterion("t_key >", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyGreaterThanOrEqualTo(String value) {
+            addCriterion("t_key >=", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyLessThan(String value) {
+            addCriterion("t_key <", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyLessThanOrEqualTo(String value) {
+            addCriterion("t_key <=", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyLike(String value) {
+            addCriterion("t_key like", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyNotLike(String value) {
+            addCriterion("t_key not like", value, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyIn(List<String> values) {
+            addCriterion("t_key in", values, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyNotIn(List<String> values) {
+            addCriterion("t_key not in", values, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyBetween(String value1, String value2) {
+            addCriterion("t_key between", value1, value2, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTKeyNotBetween(String value1, String value2) {
+            addCriterion("t_key not between", value1, value2, "tKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueIsNull() {
+            addCriterion("t_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueIsNotNull() {
+            addCriterion("t_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueEqualTo(String value) {
+            addCriterion("t_value =", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueNotEqualTo(String value) {
+            addCriterion("t_value <>", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueGreaterThan(String value) {
+            addCriterion("t_value >", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueGreaterThanOrEqualTo(String value) {
+            addCriterion("t_value >=", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueLessThan(String value) {
+            addCriterion("t_value <", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueLessThanOrEqualTo(String value) {
+            addCriterion("t_value <=", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueLike(String value) {
+            addCriterion("t_value like", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueNotLike(String value) {
+            addCriterion("t_value not like", value, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueIn(List<String> values) {
+            addCriterion("t_value in", values, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueNotIn(List<String> values) {
+            addCriterion("t_value not in", values, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueBetween(String value1, String value2) {
+            addCriterion("t_value between", value1, value2, "tValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andTValueNotBetween(String value1, String value2) {
+            addCriterion("t_value not between", value1, value2, "tValue");
+            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/bean/vo/ProvinceCompeteVo.java

@@ -247,6 +247,8 @@ public class ProvinceCompeteVo {
         private Long startTime;
         @ApiModelProperty("结束时间")
         private Long endTime;
+        @ApiModelProperty("是否限制上传时间 0不限制 1限制")
+        private int restrict;
 
 //        public Long getEndTime(){
 //            if(ObjectUtil.isNotNull(startTime) && startTime != 0){
@@ -254,12 +256,12 @@ public class ProvinceCompeteVo {
 //            }
 //            return null;
 //        }
-        public Long getStartTime(){
-            if(ObjectUtil.isNotNull(endTime) && endTime != 0){
-                return endTime - Constant.UPLOAD_VIDEO_TIME;
-            }
-            return null;
-        }
+//        public Long getStartTime(){
+//            if(ObjectUtil.isNotNull(endTime) && endTime != 0){
+//                return endTime - Constant.UPLOAD_VIDEO_TIME;
+//            }
+//            return null;
+//        }
 
     }
 

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

@@ -237,8 +237,8 @@ public class TableVo {
 
         }
         public int getTimeSum(){
-            if(duration != 0 && games != 0) {
-                return duration * games;
+            if(duration != 0 && getGames() != 0) {
+                return duration * getGames();
             }
             return 0;
         }

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/persist/mapper/ConstantMapper.java

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

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

@@ -56,8 +56,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class CompeteService implements ICompeteService {
-    @Resource
-    private CompeteTeamMapper competeTeamMapper;
     @Resource
     private CompeteTimeDao competeTimeDao;
     @Resource
@@ -98,12 +96,14 @@ public class CompeteService implements ICompeteService {
     private  CompeteScoreDao competeScoreDao;
     @Resource
     private  CompeteCountScoreMapper competeCountScoreMapper;
-    @Resource
-    private CompetePlayerMapper competePlayerMapper;
+//    @Resource
+//    private CompetePlayerMapper competePlayerMapper;
     @Resource
     private CompeteJudgmentMapper competeJudgmentMapper;
     @Resource
     private CompeteVideoMapper competeVideoMapper;
+    @Resource
+    private CompeteOrderRemarkMapper competeOrderRemarkMapper;
 
 
     @Override
@@ -1169,29 +1169,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 +1230,6 @@ public class CompeteService implements ICompeteService {
 
     }
 
-
-
-
     /**
      * 验证数据的正确性，存入数据库
      */
@@ -1689,7 +1703,7 @@ public class CompeteService implements ICompeteService {
 
     @Override
     public PageInfo<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult params) {
-        PageHelper.startPage(params.getPage(),params.getSize());
+        PageHelper.startPage(params.getPageNum(),params.getSize());
         List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId());
         PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites);
 //        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
@@ -1722,8 +1736,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());
@@ -1732,7 +1752,7 @@ public class CompeteService implements ICompeteService {
             //个人
             selScropeVo.setId(competeProject.getId());
             //个人信息
-            CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId());
+            CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeStartOrder1.getPlayerId());
             CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
             //组别信息
             selScropeVo.setGroupId(competeGroup.getId());
@@ -1761,7 +1781,7 @@ public class CompeteService implements ICompeteService {
 }
             * */
         }else {
-            CompeteTeam competeTeam = competeTeamMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId());
+            CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(competeStartOrder1.getPlayerId());
            if(competeProject.getJoinRule()==(byte)1){
                selScropeVo.setGroupName("不限组别");
 
@@ -1786,7 +1806,7 @@ public class CompeteService implements ICompeteService {
             StringBuilder names=new StringBuilder("");
             //姓名也完成了
             competeTeamMembers.forEach(mes->{
-                names.append(competePlayerMapper.selectByPrimaryKey(mes.getPlayerId()).getName()+"、");
+                names.append(competePlayerDao.selectByPrimaryKey(mes.getPlayerId()).getName()+"、");
             });
             String name= String.valueOf(names.substring(0,names.length()-2));
             selScropeVo.setName(name);
@@ -1848,7 +1868,7 @@ public class CompeteService implements ICompeteService {
             throw new BaseException(CodeEnum.PARAM_ERROR);
         }
 
-        PageHelper.startPage(param.getPage(), param.getSize());
+        PageHelper.startPage(param.getPageNum(), param.getSize());
         List<ScoreVo.CountScorePublicity> list;
         if (project.getTeam() == Constant.Compete.TEAM_YES) {
             // 团体赛

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

@@ -108,6 +108,24 @@ public class CompeteTaskService implements ICompeteTaskService {
                     log.info("{},时间与之前相同",projectConfig.getProjectId());
                     return;
                 }
+                //如果场地数量不同，则删除该项目下所有裁判，及tall内的角色
+                if(projectConfig.getSiteNum() != competeProjectConfig.getSiteNum()){
+                    CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample();
+                    judgmentExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId());
+                    List<CompeteJudgment> judgmentList = competeJudgmentDao.selectByExample(judgmentExample);
+                    if(CollectionUtil.isNotEmpty(judgmentList)){
+                        judgmentList.forEach(judgment ->{
+                            judgment.setRecStatus((byte) 2);
+                            competeJudgmentDao.updateByPrimaryKeySelective(judgment);
+
+                            MemberRoleDto.DeleteRole deleteRole = new MemberRoleDto.DeleteRole();
+                            deleteRole.setRoleId(judgment.getRoleId());
+                            deleteRole.setToken(token);
+                            log.info("删除角色：{}", judgment.getRoleId());
+                            tallFeignClient.deleteRole(deleteRole);
+                        });
+                    }
+                }
                 competeProjectConfig.setProjectDuration(projectConfig.getDuration());
                 competeProjectConfig.setSiteNum(projectConfig.getSiteNum());
                 competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
@@ -159,6 +177,7 @@ public class CompeteTaskService implements ICompeteTaskService {
                     int competeOrder = 1;
                     //场地
                     int site = 1;
+                    List<String> taskErrorList = new ArrayList<>();
                     for (Long playerIdOrTeamId : playerIdOrTeamIdList) {
                         CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
                         startOrderExample.createCriteria().andPlayerIdEqualTo(playerIdOrTeamId).andProjectIdEqualTo(project.getId());
@@ -168,12 +187,15 @@ public class CompeteTaskService implements ICompeteTaskService {
                             CompeteStartOrder competeStartOrder = startOrderList.get(0);
                             competeStartOrder.setSite((byte) site);
                             competeStartOrder.setCompeteOrder((byte) competeOrder);
-                            if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) {
+//                            if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) {
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
+                                log.info("修改场次信息：{}", competeStartOrder);
+                                startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
                                 // 修改tall的任务
                                 TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
-                                updateTaskInfo.setId(competeStartOrder.getId());
+                                updateTaskInfo.setId(competeStartOrder.getTaskId());
+                                updateTaskInfo.setName(project.getName() + competeOrder + "-" + site);
                                 updateTaskInfo.setBeginTime(competeStartOrder.getStartTime());
                                 updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
                                 updateTaskInfo.setToken(token);
@@ -184,15 +206,14 @@ public class CompeteTaskService implements ICompeteTaskService {
                                 //失败return
                                 if (ObjectUtil.isNull(normalTaskJsonResponse)) {
                                     log.info("调用tall返回null");
-                                    return;
+                                    taskErrorList.add("修改任务失败"+competeStartOrder.getTaskId());
                                 }
                                 if(normalTaskJsonResponse.getCode() != 200){
                                     log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
-                                    return;
+                                    taskErrorList.add(normalTaskJsonResponse.getMsg()+competeStartOrder.getTaskId());
                                 }
-                            }
-                            log.info("修改场次信息：{}", competeStartOrder);
-                            startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
+//                            }
+
                         } else {
                             //添加tall的任务
                             Long taskId = null;
@@ -210,11 +231,11 @@ public class CompeteTaskService implements ICompeteTaskService {
                             log.info("添加任务后返回：{}", normalTaskJsonResponse);
                             if (ObjectUtil.isNull(normalTaskJsonResponse)) {
                                 log.info("调用tall返回null");
-                                return;
+                                continue;
                             }
                             if(normalTaskJsonResponse.getCode() != 200){
                                 log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
-                                return;
+                                continue;
                             }
                             TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
                             if (ObjectUtil.isNotNull(normalTask)) {
@@ -233,6 +254,7 @@ public class CompeteTaskService implements ICompeteTaskService {
                             competeStartOrder.setEndTime(projectStartTime + orderTime);
                             log.info("添加场次信息：{}", competeStartOrder);
                             startOrderMapper.insertSelective(competeStartOrder);
+
                         }
                         site++;
                         if (site > projectConfig.getSiteNum()) {
@@ -252,6 +274,7 @@ public class CompeteTaskService implements ICompeteTaskService {
      */
     @Override
     public List<ProvinceCompeteVo.StartOrderByCompanyAndProject> queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) {
+
         return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(), param.getProjectId(), param.getCompeteTimeId());
     }
 
@@ -342,6 +365,100 @@ public class CompeteTaskService implements ICompeteTaskService {
         List<CompeteJudgment> competeJudgmentList = competeJudgmentDao.selectByExample(competeJudgmentExample);
         if (CollectionUtil.isNotEmpty(competeJudgmentList)) {
             competeJudgment = competeJudgmentList.get(0);
+            Long userId = null;
+            Long memberId = null;
+            if(!judgmentInfo.getJudgmentPhone().equalsIgnoreCase(competeJudgment.getPhone())){
+                //添加成员
+                MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember();
+                saveMember.setMemberName(judgmentInfo.getJudgmentName());
+                saveMember.setProjectId(tallProjectId);
+                saveMember.setPhone(judgmentInfo.getJudgmentPhone());
+                saveMember.setRoleId(Arrays.asList(competeJudgment.getRoleId()));
+                saveMember.setToken(token);
+                log.info("在tall内添加成员：{}", saveMember);
+                JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
+                log.info("添加成员后返回：{}", memberJsonResponse);
+                //如果成员已存在，查询成员信息然后添加至角色内
+                //失败return
+                if (ObjectUtil.isNull(memberJsonResponse)) {
+                    log.info("调用tall返回null");
+                    return;
+                }
+                if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){
+                    log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
+                    return;
+                }
+                if(memberJsonResponse.getCode() == 200){
+                    MemberVo.Member member = memberJsonResponse.getData();
+                    if(ObjectUtil.isNotNull(member)){
+                        userId = member.getUserId();
+                        memberId = member.getMemberId();
+                    }
+                }
+                //code等于21代表成员已存在
+                if (memberJsonResponse.getCode() == 21) {
+                    log.info("该成员已存在：{}", memberJsonResponse.getMsg());
+                    //查询该手机号在项目内的成员的id
+                    MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone();
+                    getMemberByPhone.setProjectId(tallProjectId);
+                    getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone());
+                    getMemberByPhone.setToken(token);
+                    log.info("查找该手机号以前的成员信息：{}", judgmentInfo.getJudgmentPhone());
+                    JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone);
+                    log.info("查找该手机号以前的成员信息返回：{}", memberListJsonResponse);
+                    //失败return
+                    if (ObjectUtil.isNull(memberListJsonResponse)) {
+                        log.info("调用tall返回null");
+                        return;
+                    }
+                    if(memberListJsonResponse.getCode() != 200){
+                        log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
+                        return;
+                    }
+
+                    MemberVo.MemberList memberList = memberListJsonResponse.getData();
+                    if (ObjectUtil.isNotNull(memberList)) {
+                        memberId = memberList.getMemberId();
+                        userId = memberList.getUserId();
+                    }
+                }
+                //将该成员添加至角色下
+                if (ObjectUtil.isNotNull(competeJudgment.getRoleId()) && ObjectUtil.isNotNull(competeJudgment.getMemberId())) {
+                    MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
+                    saveMemberInRole.setRoleId(competeJudgment.getRoleId());
+                    saveMemberInRole.setMemberId(competeJudgment.getMemberId());
+                    saveMemberInRole.setToken(token);
+                    log.info("将该成员添加至角色内");
+                    JsonResponse jsonResponse = tallFeignClient.deleteMemberInRole(saveMemberInRole);
+                    if (ObjectUtil.isNull(jsonResponse)) {
+                        log.info("调用tall返回null");
+                        return;
+                    }
+                    if(jsonResponse.getCode() != 200){
+                        log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
+                        return;
+                    }
+                }
+                //将该成员添加至角色下
+                if (ObjectUtil.isNotNull(competeJudgment.getRoleId()) && ObjectUtil.isNotNull(memberId)) {
+                    MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
+                    saveMemberInRole.setRoleId(competeJudgment.getRoleId());
+                    saveMemberInRole.setMemberId(memberId);
+                    saveMemberInRole.setToken(token);
+                    log.info("将该成员添加至角色内");
+                    JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole);
+                    if (ObjectUtil.isNull(jsonResponse)) {
+                        log.info("调用tall返回null");
+                        return;
+                    }
+                    if(jsonResponse.getCode() != 200){
+                        log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
+                        return;
+                    }
+                }
+            }
+            //删除旧成员角色关联
+            //添加新成员角色关联
             competeJudgment.setName(judgmentInfo.getJudgmentName());
             competeJudgment.setPhone(judgmentInfo.getJudgmentPhone());
             competeJudgment.setRemark(judgmentInfo.getRemark());
@@ -349,10 +466,10 @@ public class CompeteTaskService implements ICompeteTaskService {
             competeJudgment.setProjectId(project.getId());
             competeJudgment.setSite(siteJudgment.getSite());
             competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
+            competeJudgment.setUserId(userId);
+            competeJudgment.setRoleId(memberId);
             competeJudgmentDao.updateByPrimaryKeySelective(competeJudgment);
-            //修改角色
-            //修改成员
-            //修改任务
+
         } else {
             // TODO
             //添加角色
@@ -405,7 +522,7 @@ public class CompeteTaskService implements ICompeteTaskService {
                 log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
                 return;
             }
-            if(roleJsonResponse.getCode() == 200){
+            if(memberJsonResponse.getCode() == 200){
                 MemberVo.Member member = memberJsonResponse.getData();
                 if(ObjectUtil.isNotNull(member)){
                     userId = member.getUserId();
@@ -437,26 +554,24 @@ public class CompeteTaskService implements ICompeteTaskService {
                     memberId = memberList.getMemberId();
                     userId = memberList.getUserId();
                 }
-
-                //将该成员添加至角色下
-                if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) {
-                    MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
-                    saveMemberInRole.setRoleId(roleId);
-                    saveMemberInRole.setMemberId(memberId);
-                    saveMemberInRole.setToken(token);
-                    log.info("将该成员添加至角色内");
-                    JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole);
-                    if (ObjectUtil.isNull(jsonResponse)) {
-                        log.info("调用tall返回null");
-                        return;
-                    }
-                    if(jsonResponse.getCode() != 200){
-                        log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
-                        return;
-                    }
+            }
+            //将该成员添加至角色下
+            if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) {
+                MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
+                saveMemberInRole.setRoleId(roleId);
+                saveMemberInRole.setMemberId(memberId);
+                saveMemberInRole.setToken(token);
+                log.info("将该成员添加至角色内");
+                JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole);
+                if (ObjectUtil.isNull(jsonResponse)) {
+                    log.info("调用tall返回null");
+                    return;
+                }
+                if(jsonResponse.getCode() != 200){
+                    log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
+                    return;
                 }
             }
-
             //添加任务
             //查找场次信息表
             CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
@@ -498,11 +613,11 @@ public class CompeteTaskService implements ICompeteTaskService {
                             log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
                             if (ObjectUtil.isNull(pluginVoJsonResponse)) {
                                 log.info("调用tall返回null");
-                                return;
+                                continue;
                             }
                             if(pluginVoJsonResponse.getCode() != 200){
                                 log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg());
-                                return;
+                                continue;
                             }
                         }
                     }
@@ -518,9 +633,9 @@ public class CompeteTaskService implements ICompeteTaskService {
             competeJudgment.setProjectId(project.getId());
             competeJudgment.setSite(siteJudgment.getSite());
             competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
-//            competeJudgment.setRoleId(roleId);
-//            competeJudgment.setMemberId(memberId);
-//            competeJudgment.setUserId(userId);
+            competeJudgment.setRoleId(roleId);
+            competeJudgment.setMemberId(memberId);
+            competeJudgment.setUserId(userId);
             competeJudgmentDao.insertSelective(competeJudgment);
 
         }

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/java/com/ccsens/mt/util/Constant.java

@@ -60,7 +60,10 @@ public class Constant {
      * 每个比赛项目留给选手上传视频的时间(暂定一个小时，可以修改)
      */
     public static final long UPLOAD_VIDEO_TIME = 60 * 60 * 1000;
-
+    /**
+     * 比赛之前多上时间可以上传视频，（常量表内的key）
+     */
+    public static final String PROJECT_BEFORE_TIME_KEY = "project_before_time";
 
     public final static class Compete{
         public final static byte PROJECT_JOIN_RULE_GROUP_LIMIT = 0;

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

@@ -36,7 +36,7 @@
         <collection property="companyNameList" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayerList">
             <id column="companyId" property="teamId"/>
             <result column="companyName" property="companyName"/>
-            <result column="playerName" property="playerNames"/>
+            <result column="playerName" property="playerName"/>
         </collection>
     </resultMap>
 
@@ -330,57 +330,62 @@
     </select>
     <select id="getJoinNumByType" resultMap="teamNum1">
         SELECT
-        p.id as projectId,
-        p.`name` as projectName,
-        p.certificate as certificate,
-        a.groupId as groupId,
-        a.aNum as aNum,
-        p.team as team,
-        p.join_rule as joinRule
-        FROM
-        t_compete_project p
-        LEFT JOIN(
-            SELECT
             g.id as groupId,
-            g.group_name as groupName,
-            g.sequence as sequence,
-            t.projectId,
-            if(t.num is null,'/',t.num) as aNum
+            g.group_name,
+            g.projectId,
+            g.`projectName`,
+            g.`certificate`,
+            g.`team`,
+            g.`joinRule`,
+            if(count(t.ppId) = 0,'/',count(t.ppId)) as aNum
             FROM
-            t_compete_group g
-            LEFT JOIN
             (
-                SELECT
-                g.id as gid,
-                g.group_name,
-                count(pp.id) as num,
-                pp.project_id as projectId
-                FROM
-                t_compete_group g
-                LEFT JOIN t_compete_player p on p.compete_group_id = g.id
-                LEFT JOIN t_compete_project_player pp on pp.player_id = p.id
-                LEFT JOIN t_compete_company c on p.company_id = c.id
-                WHERE
-                g.type = 0
-                and g.rec_status = 0
-                and pp.rec_status = 0
-                and p.rec_status = 0
-                and p.rec_status = 0
-                and c.rec_status = 0
-                GROUP BY g.id,pp.project_id
-                ORDER BY g.sequence
-            )t
-            on (t.gid = g.id or t.gid is null)
+            SELECT
+            gr.*,
+            p.id as projectId,
+            p.`name` as projectName,
+            p.certificate as certificate,
+            p.team as team,
+            p.join_rule as joinRule
+            FROM
+            t_compete_project p ,
+            t_compete_group gr
+            WHERE
+            p.type = 0
+            and gr.type = 0
+            and p.team = 0
+            and p.`level` = 2
+            and p.rec_status = 0
+            and gr.rec_status = 0
+            )g
+            left join
+            (
+                    SELECT
+                    pp.id as ppId,
+                    pp.project_id as projectId,
+                    pr.gender,
+                    pr.group_remark
+                    FROM
+                    t_compete_project_player pp
+                  LEFT JOIN t_compete_player pr on pp.player_id = pr.id
+                    LEFT JOIN t_compete_company c on pr.company_id = c.id
+                    LEFT JOIN t_compete_project p on pp.project_id = p.id
+            WHERE
+                    pp.rec_status = 0
+                    and p.type = 0
+                    and p.team = 0
+                    and p.`level` = 2
+                    and p.rec_status = 0
+                    and c.rec_status = 0
+                    and pr.rec_status = 0
+            )t on  t.gender = g.sex
+            and t.group_remark = g.group_remark
+            and t.projectId = g.projectId
             WHERE
             g.type = 0
             and g.rec_status = 0
-        )a on (p.id = a.projectId or a.projectId is null)
-        WHERE
-        p.type = #{type}
-        and p.team = 0
-        and p.`level` = 2
-        and rec_status = 0
-        ORDER BY p.id,a.sequence
+            GROUP BY g.projectId,g.id
+            ORDER BY g.projectId,g.sequence
     </select>
     <select id="getJoinTeamNumByType" resultMap="teamNum1">
         SELECT

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

@@ -327,6 +327,7 @@
       and p.certificate = 0
       and p.rec_status = 0
       GROUP BY p.id
+      ORDER BY pc.start_time
     </select>
     <select id="queryStartOrderByCompany" resultMap="startOrderByCompany">
       SELECT

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

@@ -699,11 +699,15 @@
         order by t1.groupName, rangee
     </select>
     <select id="queryVarietyScore" resultType="com.ccsens.mt.bean.vo.CompeteVo$TotalScoreDisplay">
+        SELECT
+        t.*,
+        @rownum := @rownum + 1 AS rownum
+        FROM
+        (
                 select s.*, c.name as companyName, GROUP_CONCAT(p.name) as peopleName, (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 as avg1To3,
         (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 as avg4To6,
         (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 + (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 - s.referee0 as result,
-        case o.waiver when 1 then '弃权' when 2 then '取消比赛资格' end as remark,
-        @rownum := @rownum + 1 AS rownum
+        case o.waiver when 1 then '弃权' when 2 then '取消比赛资格' end as remark
         from
         (select site_order_id, max(if(chief_judgment = 0, score, null)) as referee0, max(if(chief_judgment = 1, score, null)) as referee1,
          max(if(chief_judgment = 2, score, null)) as referee2, max(if(chief_judgment = 3, score, null)) as referee3,
@@ -716,12 +720,13 @@
         t_compete_team t,
         t_compete_team_member m,
         t_compete_player p,
-        t_compete_company c,
-        ( SELECT @rownum := 0 ) r
+        t_compete_company c
         where s.site_order_id = o.id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
         and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
         group by s.site_order_id
         order by result desc
+        	)t,
+	(SELECT @rownum := 0)t1
     </select>
     <select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
             select q.*,identity,GROUP_CONCAT(tcch.name) as name  From
@@ -840,6 +845,7 @@
 
             ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where  t_compete_project_player.rec_status=0 ) )
             OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where  t_compete_team_member.rec_status=0  ) )
+
             ),
             1,
             0
@@ -905,7 +911,7 @@
     FROM
         (
     SELECT
-        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
+        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
         p.`name` AS projectName,
         g.`group_name` AS groupName,
         CONCAT( so.compete_order, '--', so.site ) AS startOrder,
@@ -940,7 +946,7 @@
         AND pc.rec_status = 0
         AND so.rec_status = 0 UNION
     SELECT
-        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
+        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
         p.`name` AS projectName,
         g.`group_name` AS groupName,
         CONCAT( so.compete_order, '--', so.site ) AS startOrder,

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>

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

@@ -0,0 +1,291 @@
+<?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.ConstantMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.Constant">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="business_id" jdbcType="BIGINT" property="businessId" />
+    <result column="business_type" jdbcType="TINYINT" property="businessType" />
+    <result column="t_key" jdbcType="VARCHAR" property="tKey" />
+    <result column="t_value" jdbcType="VARCHAR" property="tValue" />
+    <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, project_id, business_id, business_type, t_key, t_value, description, created_at, 
+    updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.ConstantExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_constant
+    <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_constant
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_constant
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.ConstantExample">
+    delete from t_constant
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.mt.bean.po.Constant">
+    insert into t_constant (id, project_id, business_id, 
+      business_type, t_key, t_value, 
+      description, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{businessId,jdbcType=BIGINT}, 
+      #{businessType,jdbcType=TINYINT}, #{tKey,jdbcType=VARCHAR}, #{tValue,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.Constant">
+    insert into t_constant
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="businessId != null">
+        business_id,
+      </if>
+      <if test="businessType != null">
+        business_type,
+      </if>
+      <if test="tKey != null">
+        t_key,
+      </if>
+      <if test="tValue != null">
+        t_value,
+      </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="projectId != null">
+        #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="businessId != null">
+        #{businessId,jdbcType=BIGINT},
+      </if>
+      <if test="businessType != null">
+        #{businessType,jdbcType=TINYINT},
+      </if>
+      <if test="tKey != null">
+        #{tKey,jdbcType=VARCHAR},
+      </if>
+      <if test="tValue != null">
+        #{tValue,jdbcType=VARCHAR},
+      </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.ConstantExample" resultType="java.lang.Long">
+    select count(*) from t_constant
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_constant
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=BIGINT},
+      </if>
+      <if test="record.businessId != null">
+        business_id = #{record.businessId,jdbcType=BIGINT},
+      </if>
+      <if test="record.businessType != null">
+        business_type = #{record.businessType,jdbcType=TINYINT},
+      </if>
+      <if test="record.tKey != null">
+        t_key = #{record.tKey,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tValue != null">
+        t_value = #{record.tValue,jdbcType=VARCHAR},
+      </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_constant
+    set id = #{record.id,jdbcType=BIGINT},
+      project_id = #{record.projectId,jdbcType=BIGINT},
+      business_id = #{record.businessId,jdbcType=BIGINT},
+      business_type = #{record.businessType,jdbcType=TINYINT},
+      t_key = #{record.tKey,jdbcType=VARCHAR},
+      t_value = #{record.tValue,jdbcType=VARCHAR},
+      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.Constant">
+    update t_constant
+    <set>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="businessId != null">
+        business_id = #{businessId,jdbcType=BIGINT},
+      </if>
+      <if test="businessType != null">
+        business_type = #{businessType,jdbcType=TINYINT},
+      </if>
+      <if test="tKey != null">
+        t_key = #{tKey,jdbcType=VARCHAR},
+      </if>
+      <if test="tValue != null">
+        t_value = #{tValue,jdbcType=VARCHAR},
+      </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.Constant">
+    update t_constant
+    set project_id = #{projectId,jdbcType=BIGINT},
+      business_id = #{businessId,jdbcType=BIGINT},
+      business_type = #{businessType,jdbcType=TINYINT},
+      t_key = #{tKey,jdbcType=VARCHAR},
+      t_value = #{tValue,jdbcType=VARCHAR},
+      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>

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -329,6 +329,16 @@ public class ProRoleService implements IProRoleService {
                 //修改删除状态
                 role.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
                 proRoleDao.updateByPrimaryKeySelective(role);
+                //删除该角色负责的任务
+                ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
+                proTaskDetailExample.createCriteria().andExecutorRoleEqualTo(roleId);
+                List<ProTaskDetail> taskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
+                if(CollectionUtil.isNotEmpty(taskDetailList)){
+                    taskDetailList.forEach(taskDetail -> {
+                        taskDetail.setRecStatus((byte) 2);
+                        taskDetailDao.updateByPrimaryKeySelective(taskDetail);
+                    });
+                }
 //                //彻底删除角色
 //                deleteRoleByRoleId(roleId);
             } else {

tall/src/main/java/com/ccsens/tall/web/TaskController.java

@@ -254,6 +254,7 @@ public class TaskController {
     public JsonResponse<TaskVo.NormalTask> updateTask(HttpServletRequest request,
                                    @Validated @RequestBody TaskDto.UpdateTaskInfo updateTaskInfo) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+        log.info("修改任务信息：{}",updateTaskInfo);
         TaskVo.NormalTask taskInfo = taskDetailService.updateTaskInfo(currentUserId,updateTaskInfo);
         return JsonResponse.newInstance().ok(taskInfo);
     }