liweijie/education
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部分功能重写，增加，去除冗余

Browse Source
This commit is contained in:
liumengyu
2026-08-20 17:17:36 +08:00
parent 8aeaad4309
commit c4875e86e5
34 changed files with 1997 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/FZQZBZMapper.xml
-20
View File
@@ -1,20 +0,0 @@
<?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.roomroot.mapper.FZQZBZMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.FZQZBZ">
<result column="编号" property="bH" />
<result column="序号" property="xH" />
<result column="名称" property="mC" />
<result column="创建时间" property="cJSJ" />
<result column="停用状态" property="tYZT" />
<result column="备注" property="bZ" />
<result column="停用时间" property="tYSJ" />
<result column="说明" property="sM" />
</resultMap>
<sql id="Base_Column_List">
编号, 序号, 名称, 创建时间, 停用状态, 备注, 停用时间, 说明
</sql>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/FZQZBZQZGZMapper.xml
-90
View File
@@ -1,90 +0,0 @@
<?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.roomroot.mapper.FZQZBZQZGZMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.FZQZBZQZGZ">
<result column="编号" property="bh" />
<result column="序号" property="xh" />
<result column="分值权重标准编号" property="fzqzbzbh" />
<result column="名称" property="mc" />
<result column="详细信息" property="xxxx" />
<result column="权值" property="qz" />
<result column="备注" property="bz" />
</resultMap>
<sql id="Base_Column_List">
编号, 序号, 分值权重标准编号, 名称, 详细信息, 权值, 备注
</sql>
<select id="selectAllScoreWeightRules" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM 分值权重标准_权重规则
</select>
<select id="selectScoreWeightRulesByStandardId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM 分值权重标准_权重规则
WHERE 分值权重标准编号 = #{standardId}
</select>
<select id="selectScoreWeightRuleById" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM 分值权重标准_权重规则
WHERE 编号 = #{id}
</select>
<select id="countScoreWeightRuleName" resultType="int">
SELECT COUNT(*)
FROM 分值权重标准_权重规则
WHERE 分值权重标准编号 = #{standardId}
AND 名称 = #{name}
<if test="excludeId != null">AND 编号 != #{excludeId}</if>
</select>
<insert id="insertScoreWeightRuleIfAbsent">
INSERT INTO 分值权重标准_权重规则 (编号, 序号, 分值权重标准编号, 名称, 详细信息, 权值, 备注)
SELECT #{rule.bh}, #{rule.xh}, #{rule.fzqzbzbh}, #{rule.mc}, #{rule.xxxx}, #{rule.qz}, #{rule.bz}
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM 分值权重标准_权重规则
WHERE 编号 = #{rule.bh}
)
</insert>
<update id="updateScoreWeightRule">
UPDATE 分值权重标准_权重规则
SET 序号 = #{rule.xh},
分值权重标准编号 = #{rule.fzqzbzbh},
名称 = #{rule.mc},
详细信息 = #{rule.xxxx},
权值 = #{rule.qz},
备注 = #{rule.bz}
WHERE 编号 = #{rule.bh}
</update>
<select id="countScoreWeightRuleReferences" resultType="int">
SELECT COUNT(*)
FROM 课程板块测评_评分
WHERE 权重规则编号 = #{id}
</select>
<select id="countScoreWeightRuleReferencesByStandardId" resultType="int">
SELECT COUNT(*)
FROM 分值权重标准_权重规则
WHERE 分值权重标准编号 = #{standardId}
</select>
<delete id="deleteScoreWeightRulesByStandardId">
DELETE FROM 分值权重标准_权重规则
WHERE 分值权重标准编号 = #{standardId}
</delete>
<delete id="deleteScoreWeightRuleById">
DELETE FROM 分值权重标准_权重规则
WHERE 编号 = #{id}
</delete>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/FZZHGZBZCPJGYSMapper.xml
-16
View File
@@ -1,16 +0,0 @@
<?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.roomroot.mapper.FZZHGZBZCPJGYSMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.FZZHGZBZCPJGYS">
<result column="编号" property="bH" />
<result column="名称" property="mC" />
<result column="备注" property="bZ" />
<result column="序号" property="xH" />
</resultMap>
<sql id="Base_Column_List">
编号, 名称, 备注, 序号
</sql>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/JCSJBMapper.xml
-21
View File
@@ -1,21 +0,0 @@
<?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.roomroot.mapper.JCSJBMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.JCSJB">
<result column="编号" property="bh" />
<result column="双节次" property="sjc" />
<result column="节次索引" property="jcsy" />
<result column="开始时间" property="kssj" />
<result column="结束时间" property="jssj" />
<result column="备注" property="bz" />
<result column="名称" property="mc" />
<result column="简称" property="jc" />
<result column="时段" property="sd" />
</resultMap>
<sql id="Base_Column_List">
编号, 双节次, 节次索引, 开始时间, 结束时间, 备注, 名称, 简称, 时段
</sql>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/JSZWMapper.xml
-16
View File
@@ -1,16 +0,0 @@
<?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.roomroot.mapper.JSZWMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.JSZW">
<result column="编号" property="bH" />
<result column="代码" property="dM" />
<result column="名称" property="mC" />
<result column="备注" property="bZ" />
</resultMap>
<sql id="Base_Column_List">
编号, 代码, 名称, 备注
</sql>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KSBMapper.java
-12
View File
@@ -1,12 +0,0 @@
package com.roomroot.jwgl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.roomroot.jwgl.entity.KSB;
import org.apache.ibatis.annotations.Mapper;
/**
* 考试表 Mapper
*/
@Mapper
public interface KSBMapper extends BaseMapper<KSB> {
}
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KSTJBMapper.java
+21
View File
@@ -1,12 +1,33 @@
package com.roomroot.jwgl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.roomroot.jwgl.dto.ks.HourStatisticsQuery;
import com.roomroot.jwgl.entity.KSTJB;
import com.roomroot.jwgl.vo.ks.HourStatisticsVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 课时统计表 Mapper
*/
@Mapper
public interface KSTJBMapper extends BaseMapper<KSTJB> {
/**
* 按教研室、教员、课时统计表联查课时数据。
*
* @param page 分页
* @param cond 年份、教员姓名、教员编号
* @return 分页结果
*/
Page<HourStatisticsVO> selectHourStatistics(Page<HourStatisticsVO> page,
@Param("cond") HourStatisticsQuery cond);
/**
* 导出用：不分页查询课时统计联查结果。
*/
List<HourStatisticsVO> selectHourStatisticsList(@Param("cond") HourStatisticsQuery cond);
}
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KSTJBMapper.xml
+56 -7
View File
@@ -3,15 +3,64 @@
<mapper namespace="com.roomroot.jwgl.mapper.KSTJBMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.KSTJB">
<result column="年份" property="nF" />
<result column="教员编号" property="jYBH" />
<result column="上半年" property="sBN" />
<result column="下半年" property="xBN" />
<result column="职称" property="zC" />
<result column="年份" property="nf" />
<result column="教员编号" property="jybh" />
<result column="上半年" property="sbn" />
<result column="下半年" property="xbn" />
<result column="职称" property="zc" />
</resultMap>
<sql id="Base_Column_List">
年份, 教员编号, 上半年, 下半年, 职称
<resultMap id="HourStatisticsResultMap" type="com.roomroot.jwgl.vo.ks.HourStatisticsVO">
<result column="jysdh" property="jysdh" />
<result column="jysmc" property="jysmc" />
<result column="jybh" property="jybh" />
<result column="jyxm" property="jyxm" />
<result column="zc" property="zc" />
<result column="nf" property="nf" />
<result column="sbn" property="sbn" />
<result column="xbn" property="xbn" />
</resultMap>
<sql id="HourStatisticsFromWhere">
FROM "教研室表" jys
INNER JOIN "教员表" j ON jys."教研室代号" = j."教研室代号"
INNER JOIN "课时统计表" c ON j."教员编号" = c."教员编号"
<where>
<if test="cond != null and cond.nd != null">
AND c."年份" = #{cond.nd}
</if>
<if test="cond != null and cond.jyxm != null and cond.jyxm != ''">
AND j."教员姓名" LIKE CONCAT('%', #{cond.jyxm}, '%')
</if>
<if test="cond != null and cond.jybh != null and cond.jybh != ''">
AND j."教员编号" = #{cond.jybh}
</if>
</where>
</sql>
<sql id="HourStatisticsColumns">
jys."教研室代号" AS jysdh,
jys."教研室名称" AS jysmc,
j."教员编号" AS jybh,
j."教员姓名" AS jyxm,
COALESCE(c."职称", j."职称") AS zc,
c."年份" AS nf,
COALESCE(c."上半年", 0) AS sbn,
COALESCE(c."下半年", 0) AS xbn
</sql>
<select id="selectHourStatistics" resultMap="HourStatisticsResultMap">
SELECT
<include refid="HourStatisticsColumns"/>
<include refid="HourStatisticsFromWhere"/>
ORDER BY jys."教研室代号", j."教员编号"
</select>
<select id="selectHourStatisticsList" resultMap="HourStatisticsResultMap">
SELECT
<include refid="HourStatisticsColumns"/>
<include refid="HourStatisticsFromWhere"/>
ORDER BY jys."教研室代号", j."教员编号"
</select>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KTJXFFMapper.xml
-106
View File
@@ -1,106 +0,0 @@
<?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.roomroot.mapper.KTJXFFMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.KTJXFF">
<result column="名称" property="mC" />
<result column="日课表序号" property="rKBXH" />
<result column="显示颜色" property="xSYS" />
<result column="背景颜色" property="bJYS" />
<result column="考核" property="kH" />
<result column="讲授方式" property="jSFS" />
<result column="需审批" property="xSP" />
</resultMap>
<sql id="Base_Column_List">
名称, 日课表序号, 显示颜色, 背景颜色, 考核, 讲授方式, 需审批
</sql>
<select id="selectAllTeachingMethods" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM 课堂教学方法
ORDER BY 日课表序号 ASC, 名称 ASC
</select>
<select id="selectTeachingMethodByName" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM 课堂教学方法
WHERE 名称 = #{name}
</select>
<select id="countTeachingMethodName" resultType="int">
SELECT COUNT(1)
FROM 课堂教学方法
WHERE 名称 = #{name}
<if test="excludeName != null and excludeName != ''">
AND 名称 != #{excludeName}
</if>
</select>
<insert id="insertTeachingMethodIfAbsent">
INSERT INTO 课堂教学方法 (
名称, 日课表序号, 显示颜色, 背景颜色,
考核, 讲授方式, 需审批
)
SELECT
#{teachingMethod.mC}, #{teachingMethod.rKBXH},
#{teachingMethod.xSYS}, #{teachingMethod.bJYS},
#{teachingMethod.kH}, #{teachingMethod.jSFS},
#{teachingMethod.xSP}
FROM DUAL
WHERE NOT EXISTS (
SELECT 1
FROM 课堂教学方法
WHERE 名称 = #{teachingMethod.mC}
)
</insert>
<update id="updateTeachingMethod">
UPDATE 课堂教学方法
SET 名称 = #{teachingMethod.mC},
日课表序号 = #{teachingMethod.rKBXH},
显示颜色 = #{teachingMethod.xSYS},
背景颜色 = #{teachingMethod.bJYS},
考核 = #{teachingMethod.kH},
讲授方式 = #{teachingMethod.jSFS},
需审批 = #{teachingMethod.xSP}
WHERE 名称 = #{originalName}
</update>
<select id="countTeachingMethodReferences" resultType="int">
SELECT NVL(SUM(T.引用数), 0)
FROM (
SELECT COUNT(1) AS 引用数
FROM 课堂教学方法课时系数
WHERE 课堂教学方法名称 = #{name}
UNION ALL
SELECT COUNT(1) AS 引用数
FROM 导入数据表_教学实施计划
WHERE 教学方法 = #{name}
UNION ALL
SELECT COUNT(1) AS 引用数
FROM 课堂标准
WHERE 教学方法 = #{name}
UNION ALL
SELECT COUNT(1) AS 引用数
FROM 实施_课程表
WHERE 教学方法 = #{name}
UNION ALL
SELECT COUNT(1) AS 引用数
FROM 实施_调课申请
WHERE 教学方法 = #{name}
UNION ALL
SELECT COUNT(1) AS 引用数
FROM 班次课堂教学日志
WHERE 教学方法 = #{name}
) T
</select>
<delete id="deleteTeachingMethodByName">
DELETE FROM 课堂教学方法
WHERE 名称 = #{name}
</delete>
</mapper>
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCB_RZMapper.xml
-1
View File
@@ -67,7 +67,6 @@
<select id="selectTeachingLogList" resultMap="TeachingLogResultMap">
SELECT <include refid="Full_Columns" />
FROM "实施_课程表_日志" r
LEFT JOIN "教员表" j ON j."教员编号" = r."教员编号"
LEFT JOIN "课表" k ON k."课编号" = r."课程科目编号"
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/XYXJYJTJBMapper.xml
+19 -19
View File
@@ -3,25 +3,25 @@
<mapper namespace="com.roomroot.jwgl.mapper.XYXJYJTJBMapper">
<resultMap id="BaseResultMap" type="com.roomroot.jwgl.entity.XYXJYJTJB">
<result column="编号" property="bH" />
<result column="名称" property="mC" />
<result column="培训类型" property="pXLX" />
<result column="培训层次" property="pXCC" />
<result column="当前学期考试不及格门数上限" property="dQXQKSBJGMSSX" />
<result column="当前学期考试不及格门数下限" property="dQXQKSBJGMSXX" />
<result column="当前学期考查不及格门数上限" property="dQXQKCBJGMSSX" />
<result column="当前学期考查不及格门数下限" property="dQXQKCBJGMSXX" />
<result column="当前学期不及格门数上限" property="dQXQBJGMSSX" />
<result column="当前学期不及格门数下限" property="dQXQBJGMSXX" />
<result column="全部考试不及格门数上限" property="qBKSBJGMSSX" />
<result column="全部考试不及格门数下限" property="qBKSBJGMSXX" />
<result column="全部考查不及格门数上限" property="qBKCBJGMSSX" />
<result column="全部考查不及格门数下限" property="qBKCBJGMSXX" />
<result column="全部不及格门数上限" property="qBBJGMSSX" />
<result column="全部不及格门数下限" property="qBBJGMSXX" />
<result column="停用" property="tY" />
<result column="版本" property="bB" />
<result column="修改时间" property="xGSJ" />
<result column="编号" property="bh" />
<result column="名称" property="mc" />
<result column="培训类型" property="pxlx" />
<result column="培训层次" property="pxcc" />
<result column="当前学期考试不及格门数上限" property="dqxqksbjgmssx" />
<result column="当前学期考试不及格门数下限" property="dqxqksbjgmsxx" />
<result column="当前学期考查不及格门数上限" property="dqxqkcbjgmssx" />
<result column="当前学期考查不及格门数下限" property="dqxqkcbjgmsxx" />
<result column="当前学期不及格门数上限" property="dqxqbjgmssx" />
<result column="当前学期不及格门数下限" property="dqxqbjgmsxx" />
<result column="全部考试不及格门数上限" property="qbksbjgmssx" />
<result column="全部考试不及格门数下限" property="qbksbjgmsxx" />
<result column="全部考查不及格门数上限" property="qbkcbjgmssx" />
<result column="全部考查不及格门数下限" property="qbkcbjgmsxx" />
<result column="全部不及格门数上限" property="qbbjgmssx" />
<result column="全部不及格门数下限" property="qbbjgmsxx" />
<result column="停用" property="ty" />
<result column="版本" property="bb" />
<result column="修改时间" property="xgsj" />
</resultMap>
<sql id="Base_Column_List">
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/ZYBMapper.xml
+2 -2
View File
@@ -28,7 +28,7 @@
<result column="简称" property="jc" />
<result column="节次类别" property="jclb" />
<result column="系统模式" property="xtms" />
<result column="JSONZD" property="jsonzd" />
<result column="json字典" property="jsonzd" />
<result column="主干专业" property="zgzy" />
<result column="规范名称" property="gfmc" />
<result column="教学大纲编号" property="jxdgbh" />
@@ -41,7 +41,7 @@
专业代号, 专业名称, 专业方向, 学年制, 学期数, 专业备注, 专业规范, 专业代码, 专业版本,
停用, 启用时间, 停用时间, 教学管理机构编号, 培训层次, 培训类型, 学科专业信息标识号,
培训类型2, 学员类别, 自定义分类, 专业标识号, 序号标识, 简称, 节次类别, 系统模式,
JSONZD, 主干专业, 规范名称, 教学大纲编号, 人培编号, 培养目标
json字典, 主干专业, 规范名称, 教学大纲编号, 人培编号, 培养目标
</sql>
<!-- 分页查询专业表列表（支持条件筛选） -->