From d910a3e7ad5bc3a5e5443f506d05bbb9e83a4c8e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 17:14:33 +0800
Subject: [PATCH] 生成试卷时如果题目列表为空，则不反悔这个题型的数据
---
src/main/resources/mapper/SubjectMapper.xml | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index 607c317..b253f94 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/src/main/resources/mapper/SubjectMapper.xml
@@ -1,24 +1,25 @@
<?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.SubjectMapper">
- <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.Subject">
+ <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>
<select id="getSubjectByLevel" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
- from t_subject where level= #{level}
+ from t_subject
+ where deleted = 0 and status = 1
order by item_order
</select>
@@ -27,19 +28,21 @@
select
<include refid="Base_Column_List"/>
from t_subject
+ where deleted = 0 and status = 1
+ order by item_order
</select>
- <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO">
+ <select id="page" resultType="com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO" parameterType="com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO">
SELECT
<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