From bdbc78e25a947876dbb1b859bceefb291eccac34 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 05 六月 2024 18:03:08 +0800
Subject: [PATCH] feat：新增科目界面
---
src/main/resources/mapper/QuestionMapper.xml | 8 +---
src/main/java/com/ycl/jxkg/service/SubjectService.java | 2 -
src/main/resources/mapper/SubjectMapper.xml | 18 ++++----
src/main/java/com/ycl/jxkg/domain/vo/student/education/SubjectEditRequestVO.java | 5 --
src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectEditRequestVO.java | 6 --
src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java | 8 +++-
src/main/java/com/ycl/jxkg/domain/entity/Subject.java | 23 +++++------
src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java | 4 +-
src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java | 7 ---
9 files changed, 32 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Subject.java b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
index a76e8b0..e305bcd 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
@@ -1,11 +1,12 @@
package com.ycl.jxkg.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
-import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("t_subject")
@@ -18,22 +19,18 @@
private String name;
/**
- * 骞寸骇 (1-12) 灏忓 鍒濅腑
- */
- @TableField("level")
- private Integer level;
-
- /**
- * 涓�骞寸骇銆佷簩骞寸骇绛�
- */
- @TableField("level_name")
- private String levelName;
-
- /**
* 鎺掑簭
*/
@TableField("item_order")
private Integer itemOrder;
+ @TableField("create_user")
+ private Integer createUser;
+
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @TableField(value = "status")
+ private Integer status;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectEditRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectEditRequestVO.java
index 3085cc1..ef413bd 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectEditRequestVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectEditRequestVO.java
@@ -2,7 +2,6 @@
import lombok.Data;
-
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -15,9 +14,6 @@
private String name;
@NotNull
- private Integer level;
-
- @NotBlank
- private String levelName;
+ private Integer itemOrder;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java
index 1c6ce24..cff8ffd 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java
@@ -7,8 +7,8 @@
@Data
public class SubjectPageRequestVO extends BasePage {
- private Integer id;
+ private Integer name;
- private Integer level;
+ private Integer status;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java
index 6d9d067..2594ca7 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java
@@ -1,5 +1,6 @@
package com.ycl.jxkg.domain.vo.admin.education;
+import com.ycl.jxkg.domain.enums.general.StatusEnum;
import lombok.Data;
@@ -10,8 +11,11 @@
private String name;
- private Integer level;
+ private Integer itemOrder;
- private String levelName;
+ private StatusEnum status;
+
+ private String createTime;
+
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/student/education/SubjectEditRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/student/education/SubjectEditRequestVO.java
index 0892dda..74e2596 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/student/education/SubjectEditRequestVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/student/education/SubjectEditRequestVO.java
@@ -14,9 +14,6 @@
private String name;
@NotNull
- private Integer level;
-
- @NotBlank
- private String levelName;
+ private Integer itemOrder;
}
diff --git a/src/main/java/com/ycl/jxkg/service/SubjectService.java b/src/main/java/com/ycl/jxkg/service/SubjectService.java
index f8b0d2a..1ed80c9 100644
--- a/src/main/java/com/ycl/jxkg/service/SubjectService.java
+++ b/src/main/java/com/ycl/jxkg/service/SubjectService.java
@@ -13,7 +13,5 @@
List<Subject> allSubject();
- Integer levelBySubjectId(Integer id);
-
PageInfo<Subject> page(SubjectPageRequestVO requestVM);
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
index 30bcd86..8ec423c 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
@@ -29,13 +29,8 @@
}
@Override
- public Integer levelBySubjectId(Integer id) {
- return baseMapper.selectById(id).getLevel();
- }
-
- @Override
public PageInfo<Subject> page(SubjectPageRequestVO requestVM) {
- return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
+ return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "item_order").doSelectPageInfo(() ->
subjectMapper.page(requestVM)
);
}
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 8840a15..c0266f0 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -1,12 +1,11 @@
<?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.ycl.jxkg.mapper.QuestionMapper">
+
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Question">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="question_type" jdbcType="INTEGER" property="questionType"/>
<result column="subject_id" jdbcType="INTEGER" property="subjectId"/>
- <result column="score" jdbcType="INTEGER" property="score"/>
- <result column="grade_level" jdbcType="INTEGER" property="gradeLevel"/>
<result column="difficult" jdbcType="INTEGER" property="difficult"/>
<result column="correct" jdbcType="VARCHAR" property="correct"/>
<result column="content" jdbcType="VARCHAR" property="content"/>
@@ -16,11 +15,8 @@
<result column="deleted" jdbcType="BIT" property="deleted"/>
</resultMap>
<sql id="Base_Column_List">
- id
- , question_type, subject_id, score, grade_level, difficult, correct, content,
- create_user, status, create_time, deleted
+ id, question_type, subject_id, difficult, correct, content, create_user, status, create_time, deleted
</sql>
-
<select id="page" resultType="com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO" parameterType="com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO">
SELECT
diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index 1ea7ee5..3b31e9b 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/src/main/resources/mapper/SubjectMapper.xml
@@ -4,14 +4,14 @@
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Subject">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
- <result column="level" jdbcType="INTEGER" property="level"/>
- <result column="level_name" jdbcType="VARCHAR" property="levelName"/>
<result column="item_order" jdbcType="INTEGER" property="itemOrder"/>
+ <result column="status" jdbcType="INTEGER" property="status"/>
+ <result column="create_user" jdbcType="INTEGER" property="createUser"/>
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
</resultMap>
<sql id="Base_Column_List">
- id
- , name, level, level_name, item_order, deleted
+ id, name, item_order, deleted, status, create_user, create_time
</sql>
@@ -34,12 +34,12 @@
<include refid="Base_Column_List"/>
FROM t_subject
<where>
- and deleted=0
- <if test="id != null ">
- and id= #{id}
+ and deleted = 0
+ <if test="status != null">
+ and status = #{status}
</if>
- <if test="level != null ">
- and level= #{level}
+ <if test="name != null and name != ''">
+ and instr(name, #{name})
</if>
</where>
</select>
--
Gitblit v1.8.0