Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2

# Conflicts:
#	src/main/java/club/joylink/rtss/dao/paper/PaperQuestionDAO.java
#	src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java

src/main/java/club/joylink/rtss/entity/paper/PaperQuestion.java

@@ -1,59 +0,0 @@
-package club.joylink.rtss.entity.paper;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import lombok.Data;
-
-/**
- * @author 
- * 
- */
-@Data
-public class PaperQuestion implements Serializable {
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 类型 选择题=select,判断题=judge,多选题=multi
-     */
-    private String type;
-
-    /**
-     * 创建者id
-     */
-    private Long createUserId;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 项目code
-     */
-    private String projectCode;
-
-    /**
-     * 公司组织id
-     */
-    private Long companyId;
-
-    /**
-     * 标签
-     */
-    private String raceLable;
-
-    /**
-     * 答案,号隔开
-     */
-    private String questionAnswer;
-
-    /**
-     * 是否删除0=否，1=是
-     */
-    private Integer isDel;
-
-    private static final long serialVersionUID = 1L;
-}

src/main/java/club/joylink/rtss/entity/paper/PaperQuestionExample.java

@@ -1,803 +0,0 @@
-package club.joylink.rtss.entity.paper;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-public class PaperQuestionExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    private Integer limit;
-
-    private Long offset;
-
-    public PaperQuestionExample() {
-        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;
-    }
-
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Long offset) {
-        this.offset = offset;
-    }
-
-    public Long getOffset() {
-        return offset;
-    }
-
-    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 andTypeIsNull() {
-            addCriterion("`type` is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeIsNotNull() {
-            addCriterion("`type` is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeEqualTo(String value) {
-            addCriterion("`type` =", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotEqualTo(String value) {
-            addCriterion("`type` <>", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeGreaterThan(String value) {
-            addCriterion("`type` >", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeGreaterThanOrEqualTo(String value) {
-            addCriterion("`type` >=", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeLessThan(String value) {
-            addCriterion("`type` <", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeLessThanOrEqualTo(String value) {
-            addCriterion("`type` <=", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeLike(String value) {
-            addCriterion("`type` like", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotLike(String value) {
-            addCriterion("`type` not like", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeIn(List<String> values) {
-            addCriterion("`type` in", values, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotIn(List<String> values) {
-            addCriterion("`type` not in", values, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeBetween(String value1, String value2) {
-            addCriterion("`type` between", value1, value2, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotBetween(String value1, String value2) {
-            addCriterion("`type` not between", value1, value2, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdIsNull() {
-            addCriterion("create_user_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdIsNotNull() {
-            addCriterion("create_user_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdEqualTo(Long value) {
-            addCriterion("create_user_id =", value, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdNotEqualTo(Long value) {
-            addCriterion("create_user_id <>", value, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdGreaterThan(Long value) {
-            addCriterion("create_user_id >", value, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("create_user_id >=", value, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdLessThan(Long value) {
-            addCriterion("create_user_id <", value, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdLessThanOrEqualTo(Long value) {
-            addCriterion("create_user_id <=", value, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdIn(List<Long> values) {
-            addCriterion("create_user_id in", values, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdNotIn(List<Long> values) {
-            addCriterion("create_user_id not in", values, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdBetween(Long value1, Long value2) {
-            addCriterion("create_user_id between", value1, value2, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIdNotBetween(Long value1, Long value2) {
-            addCriterion("create_user_id not between", value1, value2, "createUserId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(LocalDateTime value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(LocalDateTime value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(LocalDateTime value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(LocalDateTime value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(LocalDateTime value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(LocalDateTime value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<LocalDateTime> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<LocalDateTime> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeIsNull() {
-            addCriterion("project_code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeIsNotNull() {
-            addCriterion("project_code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeEqualTo(String value) {
-            addCriterion("project_code =", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeNotEqualTo(String value) {
-            addCriterion("project_code <>", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeGreaterThan(String value) {
-            addCriterion("project_code >", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("project_code >=", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeLessThan(String value) {
-            addCriterion("project_code <", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeLessThanOrEqualTo(String value) {
-            addCriterion("project_code <=", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeLike(String value) {
-            addCriterion("project_code like", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeNotLike(String value) {
-            addCriterion("project_code not like", value, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeIn(List<String> values) {
-            addCriterion("project_code in", values, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeNotIn(List<String> values) {
-            addCriterion("project_code not in", values, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeBetween(String value1, String value2) {
-            addCriterion("project_code between", value1, value2, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectCodeNotBetween(String value1, String value2) {
-            addCriterion("project_code not between", value1, value2, "projectCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdIsNull() {
-            addCriterion("company_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdIsNotNull() {
-            addCriterion("company_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdEqualTo(Long value) {
-            addCriterion("company_id =", value, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdNotEqualTo(Long value) {
-            addCriterion("company_id <>", value, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdGreaterThan(Long value) {
-            addCriterion("company_id >", value, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("company_id >=", value, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdLessThan(Long value) {
-            addCriterion("company_id <", value, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
-            addCriterion("company_id <=", value, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdIn(List<Long> values) {
-            addCriterion("company_id in", values, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdNotIn(List<Long> values) {
-            addCriterion("company_id not in", values, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdBetween(Long value1, Long value2) {
-            addCriterion("company_id between", value1, value2, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
-            addCriterion("company_id not between", value1, value2, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableIsNull() {
-            addCriterion("race_lable is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableIsNotNull() {
-            addCriterion("race_lable is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableEqualTo(String value) {
-            addCriterion("race_lable =", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableNotEqualTo(String value) {
-            addCriterion("race_lable <>", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableGreaterThan(String value) {
-            addCriterion("race_lable >", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableGreaterThanOrEqualTo(String value) {
-            addCriterion("race_lable >=", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableLessThan(String value) {
-            addCriterion("race_lable <", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableLessThanOrEqualTo(String value) {
-            addCriterion("race_lable <=", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableLike(String value) {
-            addCriterion("race_lable like", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableNotLike(String value) {
-            addCriterion("race_lable not like", value, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableIn(List<String> values) {
-            addCriterion("race_lable in", values, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableNotIn(List<String> values) {
-            addCriterion("race_lable not in", values, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableBetween(String value1, String value2) {
-            addCriterion("race_lable between", value1, value2, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andRaceLableNotBetween(String value1, String value2) {
-            addCriterion("race_lable not between", value1, value2, "raceLable");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerIsNull() {
-            addCriterion("question_answer is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerIsNotNull() {
-            addCriterion("question_answer is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerEqualTo(String value) {
-            addCriterion("question_answer =", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerNotEqualTo(String value) {
-            addCriterion("question_answer <>", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerGreaterThan(String value) {
-            addCriterion("question_answer >", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerGreaterThanOrEqualTo(String value) {
-            addCriterion("question_answer >=", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerLessThan(String value) {
-            addCriterion("question_answer <", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerLessThanOrEqualTo(String value) {
-            addCriterion("question_answer <=", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerLike(String value) {
-            addCriterion("question_answer like", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerNotLike(String value) {
-            addCriterion("question_answer not like", value, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerIn(List<String> values) {
-            addCriterion("question_answer in", values, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerNotIn(List<String> values) {
-            addCriterion("question_answer not in", values, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerBetween(String value1, String value2) {
-            addCriterion("question_answer between", value1, value2, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andQuestionAnswerNotBetween(String value1, String value2) {
-            addCriterion("question_answer not between", value1, value2, "questionAnswer");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelIsNull() {
-            addCriterion("is_del is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelIsNotNull() {
-            addCriterion("is_del is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelEqualTo(Integer value) {
-            addCriterion("is_del =", value, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelNotEqualTo(Integer value) {
-            addCriterion("is_del <>", value, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelGreaterThan(Integer value) {
-            addCriterion("is_del >", value, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelGreaterThanOrEqualTo(Integer value) {
-            addCriterion("is_del >=", value, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelLessThan(Integer value) {
-            addCriterion("is_del <", value, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelLessThanOrEqualTo(Integer value) {
-            addCriterion("is_del <=", value, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelIn(List<Integer> values) {
-            addCriterion("is_del in", values, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelNotIn(List<Integer> values) {
-            addCriterion("is_del not in", values, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelBetween(Integer value1, Integer value2) {
-            addCriterion("is_del between", value1, value2, "isDel");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsDelNotBetween(Integer value1, Integer value2) {
-            addCriterion("is_del not between", value1, value2, "isDel");
-            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);
-        }
-    }
-}

src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionWithBLOBs.java

@@ -1,6 +1,7 @@
-package club.joylink.rtss.entity.paper;
+package club.joylink.rtss.entity.paper.question;
 
 import java.io.Serializable;
+
 import lombok.Data;
 
 /**

src/main/java/club/joylink/rtss/services/papger/PagerQuestionService.java

@@ -5,6 +5,7 @@ import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.dao.paper.PaperQuestionDAO;
 import club.joylink.rtss.entity.paper.question.PaperQuestion;
 import club.joylink.rtss.entity.paper.question.PaperQuestionExample;
+import club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs;
 import club.joylink.rtss.entity.project.Project;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.vo.AccountVO;
@@ -61,7 +62,7 @@ public class PagerQuestionService {
         } else {
             criteria.andProjectCodeEqualTo(queryVO.getProjectCode());
         }
-        return questionDAO.selectByExample(example);
+        return questionDAO.selectByExampleWithBLOBs(example);
     }
 
     /**
@@ -70,7 +71,7 @@ public class PagerQuestionService {
      * @return
      */
     public PageVO<PaperQuestionVO> pagingQueryQuestions(QuestionQueryVO queryVO) {
-        Page<PaperQuestion> page = (Page<PaperQuestion>) this.queryQuestions(queryVO,true);
+        Page<PaperQuestionWithBLOBs> page = (Page<PaperQuestionWithBLOBs>) this.queryQuestions(queryVO,true);
         List<PaperQuestionVO> questionVOS = PaperQuestionVO.convert2VOList(page.getResult());
         return PageVO.convert(page, questionVOS);
     }
@@ -82,7 +83,7 @@ public class PagerQuestionService {
      * @return
      */
     public List<PaperQuestionVO> queryQuestions(QuestionQueryVO queryVO) {
-        List<PaperQuestion> list = (List<PaperQuestion>) this.queryQuestions(queryVO,false);
+        List<PaperQuestionWithBLOBs> list = (List<PaperQuestionWithBLOBs>) this.queryQuestions(queryVO,false);
         List<PaperQuestionVO> questionVOS = PaperQuestionVO.convert2VOList(list);
         return questionVOS;
     }
@@ -95,7 +96,7 @@ public class PagerQuestionService {
      * @return
      */
     public PaperQuestionVO getQuestion(Long questionId,boolean doNotCheckDel) {
-        PaperQuestion question = questionDAO.selectByPrimaryKey(questionId);
+        PaperQuestionWithBLOBs question = questionDAO.selectByPrimaryKey(questionId);
         boolean isDel = Objects.nonNull(question) || question.getIsDel() == BusinessConsts.DBLogicDelete.NORMAL.ordinal();
         if(doNotCheckDel){
             isDel = Objects.nonNull(question);
@@ -175,7 +176,7 @@ public class PagerQuestionService {
     public List<PaperQuestionVO> queryQuestionsForRaceLable(String projectCode, PagerLableQueryVO queryVO, boolean random) {
         BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(queryVO.allNotNullOrEmpty(),"查询内容不能为空");
         int isDel = BusinessConsts.DBLogicDelete.NORMAL.ordinal();
-        List<PaperQuestion> list = this.questionDAO.findFromAndRaceLable(projectCode,isDel,queryVO.getLables(),queryVO.getTypes());
+        List<PaperQuestionWithBLOBs> list = this.questionDAO.findFromAndRaceLable(projectCode,isDel,queryVO.getLables(),queryVO.getTypes());
         List<PaperQuestionVO> questionVOS = PaperQuestionVO.convert2VOList(list);
         return questionVOS;
     }
@@ -194,7 +195,7 @@ public class PagerQuestionService {
         }else if(questionVO.isMulti()){
             this.checkQuestionTypeForMulti(questionVO,"多选题正确答案必须是2个以上！");
         }
-        PaperQuestion question = questionVO.convert2DB();
+        PaperQuestionWithBLOBs question = questionVO.convert2DB();
         question.setCreateUserId(accountVO.getId());
         question.setCreateTime(LocalDateTime.now());
 //        question.setIsDel(BusinessConsts.DBLogicDelete.NORMAL.ordinal());
@@ -258,7 +259,7 @@ public class PagerQuestionService {
             questionDAO.deleteByExample(example);
             questions.forEach(questionVO -> {
                 questionVO.setProjectCode(projectCode);
-                PaperQuestion question = questionVO.convert2DB();
+                PaperQuestionWithBLOBs question = questionVO.convert2DB();
                 question.setProjectCode(null);
                 question.setCreateUserId(accountVO.getId());
                 question.setCreateTime(LocalDateTime.now());
@@ -272,7 +273,7 @@ public class PagerQuestionService {
             questionDAO.deleteByExample(example);
             questions.forEach(questionVO -> {
                 questionVO.setProjectCode(projectCode);
-                PaperQuestion question = questionVO.convert2DB();
+                PaperQuestionWithBLOBs question = questionVO.convert2DB();
                 question.setProjectCode(projectCode);
                 question.setCreateUserId(accountVO.getId());
                 question.setCreateTime(LocalDateTime.now());
@@ -288,7 +289,7 @@ public class PagerQuestionService {
     public void deleteQuestion(List<Long> questionId) {
         PaperQuestionExample example = new PaperQuestionExample();
         example.createCriteria().andIdIn(questionId);
-        PaperQuestion pq = new PaperQuestion();
+        PaperQuestionWithBLOBs pq = new PaperQuestionWithBLOBs();
         pq.setIsDel(BusinessConsts.DBLogicDelete.DELETE.ordinal());
         questionDAO.updateByExampleSelective(pq,example);
     }

src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionVO.java

@@ -3,6 +3,7 @@ package club.joylink.rtss.vo.client.pager.question;
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.constants.Project;
 import club.joylink.rtss.entity.paper.question.PaperQuestion;
+import club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs;
 import club.joylink.rtss.util.JsonUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -63,7 +64,7 @@ public class PaperQuestionVO implements Cloneable {
     @JsonIgnore
     private Float score = 1f;
 
-    public PaperQuestionVO(PaperQuestion question) {
+    public PaperQuestionVO(PaperQuestionWithBLOBs question) {
         this.id = question.getId();
         this.type = question.getType();
         this.question = question.getQuestion();
@@ -82,8 +83,8 @@ public class PaperQuestionVO implements Cloneable {
         }
     }
 
-    public PaperQuestion convert2DB() {
+    public PaperQuestionWithBLOBs convert2DB() {
-        PaperQuestion question = new PaperQuestion();
+        PaperQuestionWithBLOBs question = new PaperQuestionWithBLOBs();
         question.setId(this.id);
         question.setType(type);
         question.setQuestion(this.question);
@@ -116,7 +117,7 @@ public class PaperQuestionVO implements Cloneable {
     }
 
 
-    public static List<PaperQuestionVO> convert2VOList(List<PaperQuestion> questions){
+    public static List<PaperQuestionVO> convert2VOList(List<PaperQuestionWithBLOBs> questions){
         List<PaperQuestionVO> voList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(questions)) {
             questions.forEach(e -> voList.add(new PaperQuestionVO(e)));

src/main/resources/mybatis/mapper/PaperQuestionDAO.xml

@@ -1,7 +1,7 @@
 <?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="club.joylink.rtss.dao.paper.PaperQuestionDAO">
+<mapper namespace="club.joylink.rtss.dao.paper.PagerQuestionDAO">
-  <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.paper.PaperQuestion">
+  <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.paper.question.PaperQuestion">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
@@ -12,7 +12,7 @@
     <result column="question_answer" jdbcType="VARCHAR" property="questionAnswer" />
     <result column="is_del" jdbcType="INTEGER" property="isDel" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="club.joylink.rtss.entity.paper.PaperQuestionWithBLOBs">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     <result column="question" jdbcType="LONGVARCHAR" property="question" />
     <result column="question_option" jdbcType="LONGVARCHAR" property="questionOption" />
   </resultMap>
@@ -81,7 +81,7 @@
   <sql id="Blob_Column_List">
     question, question_option
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="club.joylink.rtss.entity.paper.PaperQuestionExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -105,7 +105,7 @@
       </if>
     </if>
   </select>
-  <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.PaperQuestionExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -139,13 +139,13 @@
     delete from paper_question
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.paper.PaperQuestionExample">
+  <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample">
     delete from paper_question
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="club.joylink.rtss.entity.paper.PaperQuestionWithBLOBs">
+  <insert id="insert" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     insert into paper_question (id, `type`, create_user_id,
     create_time, project_code, company_id,
     race_lable, question_answer, is_del,
@@ -155,7 +155,7 @@
     #{raceLable,jdbcType=VARCHAR}, #{questionAnswer,jdbcType=VARCHAR}, #{isDel,jdbcType=INTEGER},
     #{question,jdbcType=LONGVARCHAR}, #{questionOption,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="club.joylink.rtss.entity.paper.PaperQuestionWithBLOBs">
+  <insert id="insertSelective" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     insert into paper_question
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -228,7 +228,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="club.joylink.rtss.entity.paper.PaperQuestionExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample" resultType="java.lang.Long">
     select count(*) from paper_question
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -307,7 +307,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.paper.PaperQuestionWithBLOBs">
+  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     update paper_question
     <set>
       <if test="type != null">
@@ -343,7 +343,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="club.joylink.rtss.entity.paper.PaperQuestionWithBLOBs">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     update paper_question
     set `type` = #{type,jdbcType=VARCHAR},
     create_user_id = #{createUserId,jdbcType=BIGINT},
@@ -357,7 +357,7 @@
     question_option = #{questionOption,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.paper.PaperQuestion">
+  <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestion">
     update paper_question
     set `type` = #{type,jdbcType=VARCHAR},
     create_user_id = #{createUserId,jdbcType=BIGINT},