feat：新增科目界面

龚焕茏

2024-06-05 bdbc78e25a947876dbb1b859bceefb291eccac34

feat：新增科目界面

 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;

}

 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;

}

 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;

}

 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;


}

 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;

}

 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);
}

 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)
        );
    }

 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

 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>