From 68b02ea58e352c3874ce7ea393ef84e9faf74401 Mon Sep 17 00:00:00 2001
From: liweijie
Date: Fri, 18 Sep 2026 17:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E5=90=8D=E5=86=99?=
=?UTF-8?q?=E6=88=90=E4=BA=86=E8=8B=B1=E6=96=87=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/roomroot/jwgl/entity/JXRZXYXXQK.java | 6 +-
.../com/roomroot/jwgl/entity/JXSSJHTJB.java | 28 +++
.../java/com/roomroot/jwgl/entity/KCBMBB.java | 47 ++++
.../java/com/roomroot/jwgl/entity/KSHBZ.java | 18 +-
.../com/roomroot/jwgl/entity/KTRZXYKQB.java | 8 +
.../jwgl/mapper/OperationAnalysisMapper.xml | 217 ++++++++++--------
6 files changed, 215 insertions(+), 109 deletions(-)
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZXYXXQK.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZXYXXQK.java
index 8b106f667..64499f8a9 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZXYXXQK.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZXYXXQK.java
@@ -13,13 +13,13 @@ import java.time.LocalDateTime;
*
*/
@Data
-@TableName("教学日志_学员学习情况")
+@TableName("课堂日志学员考勤表")
public class JXRZXYXXQK {
@TableId(value = "编号", type = IdType.INPUT)
private String bh;
- @TableField("教学日志编号")
+ @TableField("日志编号")
private String jxrzbh;
@TableField("学员编号")
@@ -35,7 +35,7 @@ public class JXRZXYXXQK {
@TableField("到课情况")
private Integer dkqk;
- @TableField("请假情况")
+ @TableField("请示情况")
private Integer qjqk;
}
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java
index 55e4ae478..85238e18b 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java
@@ -3,6 +3,7 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,136 +25,163 @@ public class JXSSJHTJB {
/**
* 日期
*/
+ @TableField("日期")
private LocalDateTime rq;
/**
* 节次
*/
+ @TableField("节次")
private Integer jc;
/**
* 总学时
*/
+ @TableField("总学时")
private Integer zxs;
/**
* 总节次
*/
+ @TableField("总节次")
private Integer zjc;
/**
* 已办理计划调整数
*/
+ @TableField("已办理计划调整数")
private Integer ybljhdzs;
/**
* 调课数
*/
+ @TableField("调课数")
private Integer dks;
/**
* 教学日志填写数
*/
+ @TableField("教学日志填写数")
private Integer jxrztxs;
/**
* 已审核教学日志数
*/
+ @TableField("已审核教学日志数")
private Integer yshjxrzs;
/**
* 听查课数
*/
+ @TableField("听查课数")
private Integer tcks;
/**
* 教学督导数
*/
+ @TableField("教学督导数")
private Integer jxdds;
/**
* 开课课程门数
*/
+ @TableField("开课课程门数")
private Integer kkkcms;
/**
* 课程考核次数
*/
+ @TableField("课程考核次数")
private Integer kckhcs;
/**
* 动用教学场地数
*/
+ @TableField("动用教学场地数")
private Integer dyjxcds;
/**
* 上课教员数
*/
+ @TableField("上课教员数")
private Integer skjys;
/**
* 教学班次数
*/
+ @TableField("教学班次数")
private Integer jxbcs;
/**
* 实体教学班次数
*/
+ @TableField("实体教学班次数")
private Integer stjxbcs;
/**
* 选修教学班次数
*/
+ @TableField("选修教学班次数")
private Integer xxjxbcs;
/**
* 学员总人数
*/
+ @TableField("学员总人数")
private Integer xyzrs;
/**
* 教学请假人次
*/
+ @TableField("教学请假人次")
private Integer jxqjrc;
/**
* 教学请假学员人数
*/
+ @TableField("教学请假学员人数")
private Integer jxqjxyrs;
/**
* 缺课人次
*/
+ @TableField("缺课人次")
private Integer qkrc;
/**
* 缺课人数
*/
+ @TableField("缺课人数")
private Integer qkrs;
/**
* 已请假缺课人次
*/
+ @TableField("已请假缺课人次")
private Integer yqjqkrc;
/**
* 已请假缺课人数
*/
+ @TableField("已请假缺课人数")
private Integer yqjqkrs;
/**
* 未请假缺课人次
*/
+ @TableField("未请假缺课人次")
private Integer wqjqkrc;
/**
* 未请假缺课人数
*/
+ @TableField("未请假缺课人数")
private Integer wqjqkrs;
/**
* 修改时间
*/
+ @TableField("修改时间")
private LocalDateTime xgsj;
}
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java
index a0dd144b0..2ad19e133 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java
@@ -3,6 +3,7 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,231 +25,277 @@ public class KCBMBB {
/**
* 模版名称
*/
+ @TableField("模版名称")
private String mBMC;
/**
* 标题位置
*/
+ @TableField("标题位置")
private String bTWZ;
/**
* 专业信息位置
*/
+ @TableField("专业信息位置")
private String zYXXWZ;
/**
* 课表时间行号
*/
+ @TableField("课表时间行号")
private String kBSJHH;
/**
* 显示夜间
*/
+ @TableField("显示夜间")
private Boolean xSYJ;
/**
* 末尾列位置
*/
+ @TableField("末尾列位置")
private String mWLWZ;
/**
* 课程行位置
*/
+ @TableField("课程行位置")
private String kCHWZ;
/**
* 课程序号列位置
*/
+ @TableField("课程序号列位置")
private String kCXHLWZ;
/**
* 课程名称列位置
*/
+ @TableField("课程名称列位置")
private String kCMCLWZ;
/**
* 课程简称列位置
*/
+ @TableField("课程简称列位置")
private String kCJCLWZ;
/**
* 课程学时列位置
*/
+ @TableField("课程学时列位置")
private String kCXSLWZ;
/**
* 课程类型列位置
*/
+ @TableField("课程类型列位置")
private String kCLXLWZ;
/**
* 课程责任教研室列位置
*/
+ @TableField("课程责任教研室列位置")
private String kCZRJYSLWZ;
/**
* 课程责任教员列位置
*/
+ @TableField("课程责任教员列位置")
private String kCZRJYLWZ;
/**
* 课程授课教员列位置
*/
+ @TableField("课程授课教员列位置")
private String kCSKJYLWZ;
/**
* 课程人数列位置
*/
+ @TableField("课程人数列位置")
private String kCRSLWZ;
/**
* 课程场地列位置
*/
+ @TableField("课程场地列位置")
private String kCCDLWZ;
/**
* 全局备注位置
*/
+ @TableField("全局备注位置")
private String qJBZWZ;
/**
* 更新时间
*/
+ @TableField("更新时间")
private LocalDateTime gXSJ;
/**
* 上传者
*/
+ @TableField("上传者")
private String sCZ;
/**
* 备注
*/
+ @TableField("备注")
private String bZ;
/**
* 模版
*/
+ @TableField("模版")
private String mB;
/**
* 模版存在
*/
+ @TableField("模版存在")
private Boolean mBCZ;
/**
* 模版可用
*/
+ @TableField("模版可用")
private Boolean mBKY;
/**
* 备注纵向样式
*/
+ @TableField("备注纵向样式")
private Boolean bZZXYS;
/**
* 无课站位字符
*/
+ @TableField("无课站位字符")
private String wKZWZF;
/**
* 队别位置
*/
+ @TableField("队别位置")
private String dBWZ;
/**
* 课程合班信息位置
*/
+ @TableField("课程合班信息位置")
private String kCHBXXWZ;
/**
* 标题格式
*/
+ @TableField("标题格式")
private String bTGS;
/**
* 副标题格式
*/
+ @TableField("副标题格式")
private String fBTGS;
/**
* 专用教室位置
*/
+ @TableField("专用教室位置")
private String zYJSWZ;
/**
* 附加备注1位置
*/
+ @TableField("附加备注1位置")
private String fJBZ1WZ;
/**
* 附加备注2位置
*/
+ @TableField("附加备注2位置")
private String fJBZ2WZ;
/**
* 课表样式
*/
+ @TableField("课表样式")
private String kBYS;
/**
* 课表包含选修
*/
+ @TableField("课表包含选修")
private Boolean kBBHXX;
/**
* 纵向显示78节
*/
+ @TableField("纵向显示78节")
private Boolean zXXS78J;
/**
* 纵向显示晚上
*/
+ @TableField("纵向显示晚上")
private Boolean zXXSWS;
/**
* 纵向显示天数
*/
+ @TableField("纵向显示天数")
private Integer zXXSTS;
/**
* 课程全部场地列位置
*/
+ @TableField("课程全部场地列位置")
private String kCQBCDLWZ;
/**
* 课程表样式
*/
+ @TableField("课程表样式")
private String kCBYS;
/**
* 课程主讲教员列位置
*/
+ @TableField("课程主讲教员列位置")
private String kCZJJYLWZ;
/**
* 课程辅导教员列位置
*/
+ @TableField("课程辅导教员列位置")
private String kCFDJYLWZ;
/**
* 课程周次范围列位置
*/
+ @TableField("课程周次范围列位置")
private String kCZCFWLWZ;
/**
* 课程表起始列位置
*/
+ @TableField("课程表起始列位置")
private String kCBQSLWZ;
/**
* 课程表一周正课天数
*/
+ @TableField("课程表一周正课天数")
private Integer kCBYZZKTS;
/**
* JSONZD
*/
+ @TableField("\"json字典\"")
private String jsonZD;
}
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSHBZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSHBZ.java
index 98184725f..a9a4b9192 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSHBZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSHBZ.java
@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
*
*/
@Data
-@TableName("课时核算标准")
+@TableName("课时系数方案")
public class KSHBZ {
@TableId(value = "编号", type = IdType.INPUT)
@@ -22,23 +22,23 @@ public class KSHBZ {
private String mc;
/** 主讲教师课时系数 */
- @TableField("主讲教师课时系数")
+ @TableField("主讲课时系数")
private Float zjjyksxs;
/** 辅讲教师课时系数 */
- @TableField("辅讲教师课时系数")
+ @TableField("辅讲课时系数")
private Float fjjyksxs;
- /** 讲授方式系数(JSON格式:{"讲授":1.0,"实验":0.8,"实践":0.6}) */
- @TableField("讲授方式系数")
+ /** 讲授方式系数(JSON格式:{"讲授":1.0,"实验":0.8,"实践":0.6}),实际库中为独立子表[讲授方式课时系数] */
+ @TableField(exist = false)
private String jsfsxs;
- /** 考试主讲系数 */
- @TableField("考试主讲系数")
+ /** 考试主讲系数,实际库中无对应列 */
+ @TableField(exist = false)
private Float kszjxs;
- /** 考试指导教师系数 */
- @TableField("考试指导教师系数")
+ /** 考试指导教师系数,实际库中无对应列 */
+ @TableField(exist = false)
private Float kszdjsxs;
@TableField("说明")
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java
index dafc55cfc..89d750f10 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java
@@ -3,6 +3,7 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,36 +23,43 @@ public class KTRZXYKQB {
/**
* 日志编号
*/
+ @TableField("日志编号")
private String rzbh;
/**
* 学员编号
*/
+ @TableField("学员编号")
private String xybh;
/**
* 学习情况
*/
+ @TableField("学习情况")
private String xxqk;
/**
* 到课情况
*/
+ @TableField("到课情况")
private Integer dkqk;
/**
* 请示情况
*/
+ @TableField("请示情况")
private Integer qsqk;
/**
* 备注
*/
+ @TableField("备注")
private String bz;
/**
* 学习效果
*/
+ @TableField("学习效果")
private String xxxg;
}
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/OperationAnalysisMapper.xml b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/OperationAnalysisMapper.xml
index 7a7dbb2e8..5a51cb953 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/OperationAnalysisMapper.xml
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/OperationAnalysisMapper.xml
@@ -2,75 +2,105 @@
+
+
+
+
@@ -78,22 +108,28 @@
SELECT 0.0
+
+
+
+
-
\ No newline at end of file
+