From 859d9621628e528e7e268055070ec0341bb2e9e7 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 10 Jul 2024 15:23:47 +0800 Subject: [PATCH] 1 --- .../entity/SysTopicAndCourse.java | 30 +++ .../entity/SysTopicAndCourseExample.java | 210 ++++++++++++++++++ .../entity/dto/SysObjectiveQuestionsDto.java | 3 + .../mapper/SysObjectiveQuestionsMapper.xml | 9 +- .../mapper/SysTopicAndCourseMapper.xml | 61 ++++- 5 files changed, 304 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java b/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java index 2e46e85..69f8855 100644 --- a/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java +++ b/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java @@ -15,12 +15,18 @@ public class SysTopicAndCourse { @ApiModelProperty("一级目录ID/课程ID") private String oneId; + private String oneName; + @ApiModelProperty("二级目录ID/章ID") private String twoId; + private String twoName; + @ApiModelProperty("三级目录ID/节ID") private String threeId; + private String threeName; + @ApiModelProperty("题目类型 0客观题 1案例题 2模型题") private String topicType; @@ -48,6 +54,14 @@ public class SysTopicAndCourse { this.oneId = oneId == null ? null : oneId.trim(); } + public String getOneName() { + return oneName; + } + + public void setOneName(String oneName) { + this.oneName = oneName == null ? null : oneName.trim(); + } + public String getTwoId() { return twoId; } @@ -56,6 +70,14 @@ public class SysTopicAndCourse { this.twoId = twoId == null ? null : twoId.trim(); } + public String getTwoName() { + return twoName; + } + + public void setTwoName(String twoName) { + this.twoName = twoName == null ? null : twoName.trim(); + } + public String getThreeId() { return threeId; } @@ -64,6 +86,14 @@ public class SysTopicAndCourse { this.threeId = threeId == null ? null : threeId.trim(); } + public String getThreeName() { + return threeName; + } + + public void setThreeName(String threeName) { + this.threeName = threeName == null ? null : threeName.trim(); + } + public String getTopicType() { return topicType; } diff --git a/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourseExample.java b/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourseExample.java index c618ea1..a2e8009 100644 --- a/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourseExample.java +++ b/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourseExample.java @@ -314,6 +314,76 @@ public class SysTopicAndCourseExample { return (Criteria) this; } + public Criteria andOneNameIsNull() { + addCriterion("one_name is null"); + return (Criteria) this; + } + + public Criteria andOneNameIsNotNull() { + addCriterion("one_name is not null"); + return (Criteria) this; + } + + public Criteria andOneNameEqualTo(String value) { + addCriterion("one_name =", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameNotEqualTo(String value) { + addCriterion("one_name <>", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameGreaterThan(String value) { + addCriterion("one_name >", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameGreaterThanOrEqualTo(String value) { + addCriterion("one_name >=", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameLessThan(String value) { + addCriterion("one_name <", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameLessThanOrEqualTo(String value) { + addCriterion("one_name <=", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameLike(String value) { + addCriterion("one_name like", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameNotLike(String value) { + addCriterion("one_name not like", value, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameIn(List values) { + addCriterion("one_name in", values, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameNotIn(List values) { + addCriterion("one_name not in", values, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameBetween(String value1, String value2) { + addCriterion("one_name between", value1, value2, "oneName"); + return (Criteria) this; + } + + public Criteria andOneNameNotBetween(String value1, String value2) { + addCriterion("one_name not between", value1, value2, "oneName"); + return (Criteria) this; + } + public Criteria andTwoIdIsNull() { addCriterion("two_id is null"); return (Criteria) this; @@ -384,6 +454,76 @@ public class SysTopicAndCourseExample { return (Criteria) this; } + public Criteria andTwoNameIsNull() { + addCriterion("two_name is null"); + return (Criteria) this; + } + + public Criteria andTwoNameIsNotNull() { + addCriterion("two_name is not null"); + return (Criteria) this; + } + + public Criteria andTwoNameEqualTo(String value) { + addCriterion("two_name =", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameNotEqualTo(String value) { + addCriterion("two_name <>", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameGreaterThan(String value) { + addCriterion("two_name >", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameGreaterThanOrEqualTo(String value) { + addCriterion("two_name >=", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameLessThan(String value) { + addCriterion("two_name <", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameLessThanOrEqualTo(String value) { + addCriterion("two_name <=", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameLike(String value) { + addCriterion("two_name like", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameNotLike(String value) { + addCriterion("two_name not like", value, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameIn(List values) { + addCriterion("two_name in", values, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameNotIn(List values) { + addCriterion("two_name not in", values, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameBetween(String value1, String value2) { + addCriterion("two_name between", value1, value2, "twoName"); + return (Criteria) this; + } + + public Criteria andTwoNameNotBetween(String value1, String value2) { + addCriterion("two_name not between", value1, value2, "twoName"); + return (Criteria) this; + } + public Criteria andThreeIdIsNull() { addCriterion("three_id is null"); return (Criteria) this; @@ -454,6 +594,76 @@ public class SysTopicAndCourseExample { return (Criteria) this; } + public Criteria andThreeNameIsNull() { + addCriterion("three_name is null"); + return (Criteria) this; + } + + public Criteria andThreeNameIsNotNull() { + addCriterion("three_name is not null"); + return (Criteria) this; + } + + public Criteria andThreeNameEqualTo(String value) { + addCriterion("three_name =", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameNotEqualTo(String value) { + addCriterion("three_name <>", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameGreaterThan(String value) { + addCriterion("three_name >", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameGreaterThanOrEqualTo(String value) { + addCriterion("three_name >=", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameLessThan(String value) { + addCriterion("three_name <", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameLessThanOrEqualTo(String value) { + addCriterion("three_name <=", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameLike(String value) { + addCriterion("three_name like", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameNotLike(String value) { + addCriterion("three_name not like", value, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameIn(List values) { + addCriterion("three_name in", values, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameNotIn(List values) { + addCriterion("three_name not in", values, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameBetween(String value1, String value2) { + addCriterion("three_name between", value1, value2, "threeName"); + return (Criteria) this; + } + + public Criteria andThreeNameNotBetween(String value1, String value2) { + addCriterion("three_name not between", value1, value2, "threeName"); + return (Criteria) this; + } + public Criteria andTopicTypeIsNull() { addCriterion("topic_type is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/resource_center/entity/dto/SysObjectiveQuestionsDto.java b/src/main/java/com/sztzjy/resource_center/entity/dto/SysObjectiveQuestionsDto.java index c34022f..84bd77d 100644 --- a/src/main/java/com/sztzjy/resource_center/entity/dto/SysObjectiveQuestionsDto.java +++ b/src/main/java/com/sztzjy/resource_center/entity/dto/SysObjectiveQuestionsDto.java @@ -14,5 +14,8 @@ public class SysObjectiveQuestionsDto extends SysObjectiveQuestions { private String oneID; private String twoID; private String threeID; + private String oneName; + private String twoName; + private String threeName; private String topicAndCourseId; } diff --git a/src/main/resources/mapper/SysObjectiveQuestionsMapper.xml b/src/main/resources/mapper/SysObjectiveQuestionsMapper.xml index 9f70717..a7f06a7 100644 --- a/src/main/resources/mapper/SysObjectiveQuestionsMapper.xml +++ b/src/main/resources/mapper/SysObjectiveQuestionsMapper.xml @@ -387,12 +387,15 @@ + + + diff --git a/src/main/resources/mapper/SysTopicAndCourseMapper.xml b/src/main/resources/mapper/SysTopicAndCourseMapper.xml index 1b1cb22..212ac4c 100644 --- a/src/main/resources/mapper/SysTopicAndCourseMapper.xml +++ b/src/main/resources/mapper/SysTopicAndCourseMapper.xml @@ -5,8 +5,11 @@ + + + @@ -68,7 +71,7 @@ - id, topic_id, one_id, two_id, three_id, topic_type + id, topic_id, one_id, one_name, two_id, two_name, three_id, three_name, topic_type