From 7ae3346ad7aafe4b23ec255c959b5952664b17f6 Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Tue, 27 Sep 2022 15:13:21 +0800 Subject: [PATCH] paper --- .../entity/paper/question/PaperQuestion.java | 58 -- .../paper/question/PaperQuestionExample.java | 737 ------------------ .../rtss/services/paper/PaperUserService.java | 5 - 3 files changed, 800 deletions(-) delete mode 100644 src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java delete mode 100644 src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java diff --git a/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java deleted file mode 100644 index e81014141..000000000 --- a/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java +++ /dev/null @@ -1,58 +0,0 @@ -package club.joylink.rtss.entity.paper.question; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; -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; - - /** - * 是否删除0=否，1=是 - */ - private Integer isDel; - private String question; - - private String questionOption; - private String questionAnswer; - private static final long serialVersionUID = 1L; -} diff --git a/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java deleted file mode 100644 index fb9f185b3..000000000 --- a/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java +++ /dev/null @@ -1,737 +0,0 @@ -package club.joylink.rtss.entity.paper.question; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class PaperQuestionExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public PaperQuestionExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List 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 andTopicLike(String value) { - addCriterion("`topic` like", value, "topic"); - 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 values) { - addCriterion("`type` in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List 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 values) { - addCriterion("create_user_id in", values, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotIn(List 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(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date 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 values) { - addCriterion("project_code in", values, "projectCode"); - return (Criteria) this; - } - - public Criteria andProjectCodeNotIn(List 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 values) { - addCriterion("company_id in", values, "companyId"); - return (Criteria) this; - } - - public Criteria andCompanyIdNotIn(List 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 values) { - addCriterion("race_lable in", values, "raceLable"); - return (Criteria) this; - } - - public Criteria andRaceLableNotIn(List 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 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 values) { - addCriterion("is_del in", values, "isDel"); - return (Criteria) this; - } - - public Criteria andIsDelNotIn(List 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); - } - } -} diff --git a/src/main/java/club/joylink/rtss/services/paper/PaperUserService.java b/src/main/java/club/joylink/rtss/services/paper/PaperUserService.java index fbd87d165..101b17796 100644 --- a/src/main/java/club/joylink/rtss/services/paper/PaperUserService.java +++ b/src/main/java/club/joylink/rtss/services/paper/PaperUserService.java @@ -2,7 +2,6 @@ package club.joylink.rtss.services.paper; import club.joylink.rtss.dao.paper.*; import club.joylink.rtss.entity.paper.*; -import club.joylink.rtss.entity.paper.question.PaperQuestion; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.paper.*; @@ -13,10 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestAttribute; import java.time.Duration; import java.time.LocalDateTime;