From 33d945c59413507e05a2baa2efd9ac502f6a0419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 6 Nov 2025 14:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScClaTimeController.java       |   3 +-
 .../domain/req/time/ReqSearchClaTime.java     |  15 +-
 .../req/time/ReqSearchScClaTimeRule.java      |   6 +
 .../domain/resp/time/ClaTimeCalendarItem.java |   4 +-
 .../course/domain/resp/time/RespClaTime.java  |   6 +-
 .../domain/resp/time/RespClaTimeCalendar.java | 185 +++++++++++++-
 .../domain/resp/time/RespClaTimeRule.java     | 133 +++++++++-
 .../course/repo/mapping/ScClaTimeMapper.xml   |   2 +-
 .../repo/mapping/ScClaTimeRuleMapper.xml      |   4 +-
 .../sc/course/repo/model/ScClaTimeRuleVo.java | 185 ++++++++++++++
 .../sc/course/repo/model/ScClaTimeVo.java     | 231 ++++++++++++++++++
 .../sc/course/repo/model/ScCourseVo.java      |   2 +-
 .../service/BusinessClaTimeRuleService.java   |   7 +-
 .../service/BusinessClaTimeService.java       |  13 +-
 .../service/BusinessScCourseClaService.java   |   4 +-
 .../domain/req/ReqSearchScStudent.java        |   5 +
 .../domain/resp/RespStudentCourse.java        |   2 +-
 .../student/repo/mapping/ScStudentMapper.xml  |   2 +-
 18 files changed, 782 insertions(+), 27 deletions(-)
 create mode 100644 ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeRuleVo.java
 create mode 100644 ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeVo.java

diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScClaTimeController.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScClaTimeController.java
index 4d322a1..91c30d5 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScClaTimeController.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScClaTimeController.java
@@ -5,6 +5,7 @@ import cn.xluobo.business.sc.course.domain.resp.time.RespBusinessClaTimeCalendar
 import cn.xluobo.business.sc.course.domain.resp.time.RespClaTime;
 import cn.xluobo.business.sc.course.domain.resp.time.RespClaTimeCalendar;
 import cn.xluobo.business.sc.course.repo.model.ScClaTime;
+import cn.xluobo.business.sc.course.repo.model.ScClaTimeVo;
 import cn.xluobo.business.sc.course.service.BusinessClaTimeService;
 import cn.xluobo.business.sc.student.domain.req.ReqClaTimeAttend;
 import cn.xluobo.core.api.APIResponse;
@@ -89,7 +90,7 @@ public class ScClaTimeController {
      * @return
      */
     @PutMapping("/update/updateScClaTime")
-    public APIResponse updateScClaTime(@RequestBody ScClaTime scClaTime) {
+    public APIResponse updateScClaTime(@RequestBody ScClaTimeVo scClaTime) {
         return claTimeService.updateClaTime(scClaTime);
     }
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchClaTime.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchClaTime.java
index de7774e..2c6b5cd 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchClaTime.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchClaTime.java
@@ -1,6 +1,7 @@
 package cn.xluobo.business.sc.course.domain.req.time;
 
 import cn.xluobo.core.page.ReqPageBase;
+import com.ruoyi.common.utils.SecurityUtils;
 import lombok.Data;
 import org.joda.time.DateTime;
 
@@ -14,10 +15,10 @@ import java.io.Serializable;
 public class ReqSearchClaTime extends ReqPageBase implements Serializable {
 
     // 排课 编号
-    private Long courseTimeId;
+    private String courseTimeId;
 
     // 课程
-    private Long courseId;
+    private String courseId;
 
     // 校区
     private Long deptId;
@@ -26,10 +27,10 @@ public class ReqSearchClaTime extends ReqPageBase implements Serializable {
     private String userId;
 
     // 班级
-    private Long claId;
+    private String claId;
 
     // 学生
-    private Long studentId;
+    private String studentId;
 
     private Long teacherId;
 
@@ -58,6 +59,12 @@ public class ReqSearchClaTime extends ReqPageBase implements Serializable {
      */
     private String orderByType;
 
+    private String tenantId;
+
+    public String getTenantId(){
+        return SecurityUtils.getLoginUser().getNowTenantId();
+    }
+
     public void setDiffNowDay(Integer diffNowDay) {
         this.diffNowDay = diffNowDay;
         if(null != diffNowDay) {
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchScClaTimeRule.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchScClaTimeRule.java
index 8a1810d..d14bea0 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchScClaTimeRule.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/time/ReqSearchScClaTimeRule.java
@@ -1,6 +1,7 @@
 package cn.xluobo.business.sc.course.domain.req.time;
 
 import cn.xluobo.core.page.ReqPageBase;
+import com.ruoyi.common.utils.SecurityUtils;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -19,6 +20,11 @@ public class ReqSearchScClaTimeRule extends ReqPageBase implements Serializable
     private Boolean filterHoliday;
     private String beginDate;
     private String endDate;
+    private String tenantId;
+
+    public String getTenantId(){
+        return SecurityUtils.getLoginUser().getNowTenantId();
+    }
 
     public void setClaDate(String[] claDate) {
         this.claDate = claDate;
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/ClaTimeCalendarItem.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/ClaTimeCalendarItem.java
index 3bf1a74..204c074 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/ClaTimeCalendarItem.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/ClaTimeCalendarItem.java
@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class ClaTimeCalendarItem {
 
-    private Long courseTimeId;
+    private String courseTimeId;
 
     private String claName;
 
@@ -40,7 +40,7 @@ public class ClaTimeCalendarItem {
     private String claTimeStatus;
 
     public ClaTimeCalendarItem transfer(RespClaTimeCalendar respClaTime) {
-        this.courseTimeId = respClaTime.getCourseTimeId();
+        this.courseTimeId = respClaTime.getCourseTimeId()+"";
         this.claName = respClaTime.getClaName();
         this.courseName = respClaTime.getCourseName();
         this.claDate = respClaTime.getClaDate();
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTime.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTime.java
index 0e46f43..1c9b0a9 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTime.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTime.java
@@ -13,13 +13,13 @@ import java.util.Date;
 @Data
 public class RespClaTime {
 
-    private Long courseTimeId;
+    private String courseTimeId;
 
-    private Long claId;
+    private String claId;
 
     private String claName;
 
-    private Long courseId;
+    private String courseId;
 
     private String courseName;
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeCalendar.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeCalendar.java
index 728f2b0..853de05 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeCalendar.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeCalendar.java
@@ -1,15 +1,21 @@
 package cn.xluobo.business.sc.course.domain.resp.time;
 
 import cn.xluobo.business.sc.course.repo.model.ScClaTime;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 排课信息（课表）
  * @author ：zhangbaoyu
  * @date ：Created in 2020/9/18 14:50
  */
 @Data
-public class RespClaTimeCalendar extends ScClaTime {
+public class RespClaTimeCalendar {
 
     private String claColor;
 
@@ -23,4 +29,181 @@ public class RespClaTimeCalendar extends ScClaTime {
 
     private Integer studentCount;
 
+    /**
+     * 排课编号
+     */
+    @TableId(value = "course_time_id", type = IdType.ASSIGN_ID)
+    private String courseTimeId;
+
+    /**
+     * 规则编号
+     */
+    @TableField("rule_id")
+    private String ruleId;
+
+    /**
+     * 班级id
+     */
+    @TableField("cla_id")
+    private String claId;
+
+    /**
+     * 任课教师
+     */
+    @TableField("teacher_id")
+    private Long teacherId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_id")
+    private String roomId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_name")
+    private String roomName;
+
+    /**
+     * 上课主题
+     */
+    @TableField("class_theme")
+    private String classTheme;
+
+    /**
+     * 上课日期 如:2020-02-05
+     */
+    @TableField("cla_date")
+    private String claDate;
+
+    /**
+     * 上课开始时间
+     */
+    @TableField("start_time")
+    private String startTime;
+
+    /**
+     * 上课结束时间
+     */
+    @TableField("end_time")
+    private String endTime;
+
+    /**
+     * 实际上课时间
+     */
+    @TableField("real_cla_date")
+    private String realClaDate;
+
+    /**
+     * 实际开始时间
+     */
+    @TableField("real_start_time")
+    private String realStartTime;
+
+    /**
+     * 实际结束时间
+     */
+    @TableField("real_end_time")
+    private String realEndTime;
+
+    /**
+     * 课时变更数量
+     */
+    @TableField("pay_hour")
+    private BigDecimal payHour;
+
+    /**
+     * 总课时消耗
+     */
+    @TableField("pay_total_hour")
+    private BigDecimal payTotalHour;
+
+    /**
+     * 总学费消耗
+     */
+    @TableField("pay_total_fee")
+    private BigDecimal payTotalFee;
+
+    /**
+     * 来源 1:重复排课 2:未排课上课 3:单个新增
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 状态 1:待上课 2:已上课
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 应到人数
+     */
+    @TableField("book_attend_cnt")
+    private Integer bookAttendCnt;
+
+    /**
+     * 实到人数
+     */
+    @TableField("real_attend_cnt")
+    private Integer realAttendCnt;
+
+    /**
+     * 到课人数
+     */
+    @TableField("at_class_cnt")
+    private Integer atClassCnt;
+
+    /**
+     * 请假人数
+     */
+//    @TableField("leave_cnt")
+//    private Integer leaveCnt;
+
+    /**
+     * 缺勤人数
+     */
+    @TableField("out_cnt")
+    private Integer outCnt;
+
+    /**
+     * 备注
+     */
+    @TableField("memo")
+    private String memo;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_user")
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("last_update_user")
+    private Long lastUpdateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField("last_update_time")
+    private Date lastUpdateTime;
+
+    @TableField(exist = false)
+    private Long deptId;
+    @TableField(exist = false)
+    private String courseName;
+    @TableField(exist = false)
+    private String claName;
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeRule.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeRule.java
index e971c3a..86b120c 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeRule.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTimeRule.java
@@ -1,11 +1,16 @@
 package cn.xluobo.business.sc.course.domain.resp.time;
 
 import cn.xluobo.business.sc.course.repo.model.ScClaTimeRule;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 /**
  * 排课信息
  * @author ：zhangbaoyu
@@ -15,7 +20,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class RespClaTimeRule extends ScClaTimeRule {
+public class RespClaTimeRule {
 
     private String courseName;
     private String claName;
@@ -26,4 +31,130 @@ public class RespClaTimeRule extends ScClaTimeRule {
 
     private String weekDayName;
 
+    /**
+     * 规则id
+     */
+    @TableId(value = "rule_id", type = IdType.ASSIGN_ID)
+    private String ruleId;
+
+    /**
+     * 班级
+     */
+    @TableField("cla_id")
+    private String claId;
+
+    /**
+     * 规则类型 1重复排课 2单次排课
+     */
+    @TableField("rule_type")
+    private String ruleType;
+
+    /**
+     * 开始日期
+     */
+    @TableField("begin_date")
+    private String beginDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField("end_date")
+    private String endDate;
+
+    /**
+     * 单次排课 日期
+     */
+    @TableField("once_date")
+    private String onceDate;
+
+    /**
+     * 重复方式 1每周重复 2隔天重复 3隔周重复
+     */
+    @TableField("repeat_type")
+    private String repeatType;
+
+    /**
+     * 上课星期 周几上课
+     */
+    @TableField("week_day")
+    private String weekDay;
+
+    /**
+     * 是否过滤节假日 1过滤 0不过滤
+     */
+    @TableField("filter_holiday")
+    private boolean filterHoliday;
+
+    /**
+     * 上课时间
+     */
+    @TableField("start_time")
+    private String startTime;
+
+    /**
+     * 下课时间
+     */
+    @TableField("end_time")
+    private String endTime;
+
+    /**
+     * 任课教师
+     */
+    @TableField("teacher_id")
+    private Long teacherId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_id")
+    private String roomId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_name")
+    private String roomName;
+
+    /**
+     * 上课主题
+     */
+    @TableField("class_theme")
+    private String classTheme;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_user")
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("last_update_user")
+    private Long lastUpdateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField("last_update_time")
+    private Date lastUpdateTime;
+
+    /**
+     * 单次排课 选择的上课日期
+     */
+    @TableField(exist = false)
+    private String[] chooseDate;
+
+    /**
+     * 所属校区
+     */
+    @TableField(exist = false)
+    private Long deptId;
+
 }
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeMapper.xml
index e0010ab..2c5f81b 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeMapper.xml
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeMapper.xml
@@ -68,7 +68,7 @@
                  left join sc_course course on cc.course_id=course.course_id,
              sc_cla_time ct
                  left join sys_staff s on ct.teacher_id=s.staff_id
-        where cc.cla_id = ct.cla_id
+        where cc.cla_id = ct.cla_id and cc.tenant_id=#{searchClaTime.tenantId}
         <if test="searchClaTime.beginDate != null and searchClaTime.beginDate != '' and searchClaTime.endDate != null and searchClaTime.endDate != ''">
             and ct.cla_date between #{searchClaTime.beginDate} and #{searchClaTime.endDate}
         </if>
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeRuleMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeRuleMapper.xml
index fd78dab..c0210b3 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeRuleMapper.xml
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeRuleMapper.xml
@@ -4,9 +4,9 @@
 
     <select id="selectByCondition" resultType="cn.xluobo.business.sc.course.domain.resp.time.RespClaTimeRule">
         select b.*,fcn_dict_name_list(b.week_day,'week_day') as week_day_name,
-               a.cla_name,c.course_name,d.nick_name
+               a.cla_name,c.course_name,d.nick_name staff_name
         from sc_course_cla a, sc_cla_time_rule b, sc_course c, sys_user d
-        where a.cla_id = b.cla_id and a.course_id=c.course_id and b.teacher_id=d.user_id
+        where a.cla_id = b.cla_id and a.course_id=c.course_id and b.teacher_id=d.user_id and a.tenant_id=#{reqSearchScClaTimeRule.tenantId}
         <if test="reqSearchScClaTimeRule.deptId != null">
             and a.depart_id=#{reqSearchScClaTimeRule.deptId}
         </if>
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeRuleVo.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeRuleVo.java
new file mode 100644
index 0000000..2b4bfcc
--- /dev/null
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeRuleVo.java
@@ -0,0 +1,185 @@
+package cn.xluobo.business.sc.course.repo.model;
+
+import cn.xluobo.business.sc.course.repo.enums.ClaTimeRepeatTypeEnums;
+import cn.xluobo.business.sc.course.repo.enums.ClaTimeRuleTypeEnums;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 上课时间配置规则
+ * </p>
+ *
+ * @author zhangby
+ * @since 2020-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sc_cla_time_rule")
+public class ScClaTimeRuleVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 规则id
+     */
+    @TableId(value = "rule_id", type = IdType.ASSIGN_ID)
+    private String ruleId;
+
+    /**
+     * 班级
+     */
+    @TableField("cla_id")
+    private String claId;
+
+    /**
+     * 规则类型 1重复排课 2单次排课
+     */
+    @TableField("rule_type")
+    private String ruleType;
+
+    /**
+     * 开始日期
+     */
+    @TableField("begin_date")
+    private String beginDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField("end_date")
+    private String endDate;
+
+    /**
+     * 单次排课 日期
+     */
+    @TableField("once_date")
+    private String onceDate;
+
+    /**
+     * 重复方式 1每周重复 2隔天重复 3隔周重复
+     */
+    @TableField("repeat_type")
+    private String repeatType;
+
+    /**
+     * 上课星期 周几上课
+     */
+    @TableField("week_day")
+    private String weekDay;
+
+    /**
+     * 是否过滤节假日 1过滤 0不过滤
+     */
+    @TableField("filter_holiday")
+    private boolean filterHoliday;
+
+    /**
+     * 上课时间
+     */
+    @TableField("start_time")
+    private String startTime;
+
+    /**
+     * 下课时间
+     */
+    @TableField("end_time")
+    private String endTime;
+
+    /**
+     * 任课教师
+     */
+    @TableField("teacher_id")
+    private Long teacherId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_id")
+    private String roomId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_name")
+    private String roomName;
+
+    /**
+     * 上课主题
+     */
+    @TableField("class_theme")
+    private String classTheme;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_user")
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("last_update_user")
+    private Long lastUpdateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField("last_update_time")
+    private Date lastUpdateTime;
+
+    /**
+     * 单次排课 选择的上课日期
+     */
+    @TableField(exist = false)
+    private String[] chooseDate;
+
+    /**
+     * 所属校区
+     */
+    @TableField(exist = false)
+    private Long deptId;
+
+    public boolean checkParam() {
+        if (null == claId || null == teacherId) {
+            return false;
+        }
+        if (StringUtils.isAnyEmpty(ruleType)) {
+            return false;
+        }
+        if (ClaTimeRuleTypeEnums.ONCE_RULE.getRuleType().equals(ruleType)) {
+            if (StringUtils.isAnyEmpty(startTime, endTime)) {
+                return false;
+            } else if (null == chooseDate || chooseDate.length == 0) {
+                return false;
+            }
+        }
+        if ("1".equals(ruleType) && StringUtils.isAnyEmpty(repeatType)) {
+            return false;
+        }
+        if (ClaTimeRepeatTypeEnums.EVERY_WEEK.getRepeatType().equals(repeatType)
+                || ClaTimeRepeatTypeEnums.EVERY_SECOND_WEEK.getRepeatType().equals(repeatType)) {
+            return !StringUtils.isAnyEmpty(startTime, endTime, beginDate, endDate);
+        } else {
+            return !StringUtils.isAnyEmpty(startTime, endTime);
+        }
+    }
+
+
+}
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeVo.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeVo.java
new file mode 100644
index 0000000..31e0dea
--- /dev/null
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeVo.java
@@ -0,0 +1,231 @@
+package cn.xluobo.business.sc.course.repo.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 排课信息
+ * </p>
+ *
+ * @author zhangby
+ * @since 2020-09-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sc_cla_time")
+public class ScClaTimeVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 排课编号
+     */
+    @TableId(value = "course_time_id", type = IdType.ASSIGN_ID)
+    private String courseTimeId;
+
+    /**
+     * 规则编号
+     */
+    @TableField("rule_id")
+    private String ruleId;
+
+    /**
+     * 班级id
+     */
+    @TableField("cla_id")
+    private String claId;
+
+    /**
+     * 任课教师
+     */
+    @TableField("teacher_id")
+    private Long teacherId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_id")
+    private String roomId;
+
+    /**
+     * 上课教室
+     */
+    @TableField("room_name")
+    private String roomName;
+
+    /**
+     * 上课主题
+     */
+    @TableField("class_theme")
+    private String classTheme;
+
+    /**
+     * 上课日期 如:2020-02-05
+     */
+    @TableField("cla_date")
+    private String claDate;
+
+    /**
+     * 上课开始时间
+     */
+    @TableField("start_time")
+    private String startTime;
+
+    /**
+     * 上课结束时间
+     */
+    @TableField("end_time")
+    private String endTime;
+
+    /**
+     * 实际上课时间
+     */
+    @TableField("real_cla_date")
+    private String realClaDate;
+
+    /**
+     * 实际开始时间
+     */
+    @TableField("real_start_time")
+    private String realStartTime;
+
+    /**
+     * 实际结束时间
+     */
+    @TableField("real_end_time")
+    private String realEndTime;
+
+    /**
+     * 课时变更数量
+     */
+    @TableField("pay_hour")
+    private BigDecimal payHour;
+
+    /**
+     * 总课时消耗
+     */
+    @TableField("pay_total_hour")
+    private BigDecimal payTotalHour;
+
+    /**
+     * 总学费消耗
+     */
+    @TableField("pay_total_fee")
+    private BigDecimal payTotalFee;
+
+    /**
+     * 来源 1:重复排课 2:未排课上课 3:单个新增
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 状态 1:待上课 2:已上课
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 应到人数
+     */
+    @TableField("book_attend_cnt")
+    private Integer bookAttendCnt;
+
+    /**
+     * 实到人数
+     */
+    @TableField("real_attend_cnt")
+    private Integer realAttendCnt;
+
+    /**
+     * 到课人数
+     */
+    @TableField("at_class_cnt")
+    private Integer atClassCnt;
+
+    /**
+     * 请假人数
+     */
+//    @TableField("leave_cnt")
+//    private Integer leaveCnt;
+
+    /**
+     * 缺勤人数
+     */
+    @TableField("out_cnt")
+    private Integer outCnt;
+
+    /**
+     * 备注
+     */
+    @TableField("memo")
+    private String memo;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_user")
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("last_update_user")
+    private Long lastUpdateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField("last_update_time")
+    private Date lastUpdateTime;
+
+    @TableField(exist = false)
+    private Long deptId;
+    @TableField(exist = false)
+    private String courseName;
+    @TableField(exist = false)
+    private String claName;
+    @TableField(exist = false)
+    private String deptName;
+
+    public boolean checkUpdateParam() {
+        if (StringUtils.isAnyEmpty(claDate, startTime, endTime)) {
+            return false;
+        }
+        if (null == teacherId) {
+            return false;
+        }
+        return true;
+    }
+
+    public boolean checkAddParam() {
+        if(null == claId || null == teacherId) {
+            return false;
+        }
+        if (StringUtils.isAnyEmpty(claDate, startTime, endTime)) {
+            return false;
+        }
+        return true;
+    }
+
+
+
+}
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseVo.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseVo.java
index ce16e69..3bf1aee 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseVo.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseVo.java
@@ -80,7 +80,7 @@ public class ScCourseVo implements Serializable {
      * 创建者
      */
     @TableField("create_user")
-    private Long createUser;
+    private String createUser;
 
     /**
      * 创建时间
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeRuleService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeRuleService.java
index 460b089..c7c4e06 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeRuleService.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeRuleService.java
@@ -1,5 +1,6 @@
 package cn.xluobo.business.sc.course.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.xluobo.business.sc.base.repo.model.ScRoom;
 import cn.xluobo.business.sc.base.service.IScRoomService;
 import cn.xluobo.business.sc.course.domain.req.time.ReqSearchScClaTimeRule;
@@ -7,6 +8,7 @@ import cn.xluobo.business.sc.course.domain.resp.time.RespClaTimeRule;
 import cn.xluobo.business.sc.course.repo.mapper.ScClaTimeRuleMapper;
 import cn.xluobo.business.sc.course.repo.model.ScClaTime;
 import cn.xluobo.business.sc.course.repo.model.ScClaTimeRule;
+import cn.xluobo.business.sc.course.repo.model.ScClaTimeRuleVo;
 import cn.xluobo.business.sc.course.repo.model.ScCourseCla;
 import cn.xluobo.core.api.APIResponse;
 import cn.xluobo.core.api.ApiResEnums;
@@ -88,12 +90,15 @@ public class BusinessClaTimeRuleService {
             return APIResponse.toAPIResponse(null);
         }
         ScClaTimeRule claTimeRule = claTimeRuleService.getById(ruleId);
+        ScClaTimeRuleVo scClaTimeRuleVo = new ScClaTimeRuleVo();
+        BeanUtil.copyProperties(claTimeRule,scClaTimeRuleVo);
         // 设置deptId
         Long claId = claTimeRule.getClaId();
         ScCourseCla courseCla = courseClaService.getById(claId);
         claTimeRule.setDeptId(courseCla.getDepartId());
+        scClaTimeRuleVo.setDeptId(courseCla.getDepartId());
 
-        return APIResponse.toAPIResponse(claTimeRule);
+        return APIResponse.toAPIResponse(scClaTimeRuleVo);
     }
 
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeService.java
index 35c0dd0..350d652 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeService.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessClaTimeService.java
@@ -1,15 +1,13 @@
 package cn.xluobo.business.sc.course.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.xluobo.business.sc.base.repo.model.ScRoom;
 import cn.xluobo.business.sc.base.service.IScRoomService;
 import cn.xluobo.business.sc.course.domain.req.time.ReqSearchClaTime;
 import cn.xluobo.business.sc.course.domain.resp.time.*;
 import cn.xluobo.business.sc.course.repo.enums.ClaTimeStatusEnums;
 import cn.xluobo.business.sc.course.repo.mapper.ScClaTimeMapper;
-import cn.xluobo.business.sc.course.repo.model.ScClaTime;
-import cn.xluobo.business.sc.course.repo.model.ScClaTimeAttend;
-import cn.xluobo.business.sc.course.repo.model.ScCourse;
-import cn.xluobo.business.sc.course.repo.model.ScCourseCla;
+import cn.xluobo.business.sc.course.repo.model.*;
 import cn.xluobo.business.sc.student.domain.req.ReqClaTimeAttend;
 import cn.xluobo.business.sc.student.service.BusinessScStudentCourseService;
 import cn.xluobo.business.sc.student.service.IScStudentCourseService;
@@ -245,7 +243,10 @@ public class BusinessClaTimeService {
             }
         }
 
-        return APIResponse.toAPIResponse(claTime);
+        ScClaTimeVo scClaTimeVo = new ScClaTimeVo();
+        BeanUtil.copyProperties(claTime,scClaTimeVo);
+
+        return APIResponse.toAPIResponse(scClaTimeVo);
     }
 
     /**
@@ -254,7 +255,7 @@ public class BusinessClaTimeService {
      * @param claTime
      * @return
      */
-    public APIResponse updateClaTime(ScClaTime claTime) {
+    public APIResponse updateClaTime(ScClaTimeVo claTime) {
         if (null == claTime.getCourseTimeId()) {
             return APIResponse.toExceptionResponse(ApiResEnums.PARAM_FAIL);
         }
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseClaService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseClaService.java
index 310e5d6..f1e15b7 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseClaService.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseClaService.java
@@ -166,8 +166,8 @@ public class BusinessScCourseClaService {
 
         // 教师
         if (null != courseCla.getStaffId()) {
-            SysStaff staff = teacherService.getById(courseCla.getStaffId());
-            courseCla.setTeacherName(staff.getStaffName());
+            SysUser staff = userService.selectUserById(courseCla.getStaffId());
+            courseCla.setTeacherName(staff.getNickName());
         }
 
         // 上课时间
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/req/ReqSearchScStudent.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/req/ReqSearchScStudent.java
index 7039fb5..4281b2a 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/req/ReqSearchScStudent.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/req/ReqSearchScStudent.java
@@ -1,6 +1,7 @@
 package cn.xluobo.business.sc.student.domain.req;
 
 import cn.xluobo.core.page.ReqPageBase;
+import com.ruoyi.common.utils.SecurityUtils;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,4 +20,8 @@ public class ReqSearchScStudent extends ReqPageBase implements Serializable {
     private String sex;
 
     private String phone;
+
+    public String getTenantId(){
+        return SecurityUtils.getLoginUser().getNowTenantId();
+    }
 }
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespStudentCourse.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespStudentCourse.java
index c7a81b0..8336d67 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespStudentCourse.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespStudentCourse.java
@@ -16,7 +16,7 @@ import java.math.BigDecimal;
 @Data
 public class RespStudentCourse {
 
-    private Long studentCourseId;
+    private String studentCourseId;
 
     private String courseName;
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/mapping/ScStudentMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/mapping/ScStudentMapper.xml
index 85e6e0a..f33160f 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/mapping/ScStudentMapper.xml
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/mapping/ScStudentMapper.xml
@@ -7,7 +7,7 @@
                b.school_name,
                (select group_concat(sc.contact_nick,'(',fcn_dict_name(sc.contact_relation,'contact_relation'),') ',sc.contact_phone separator ';') from sc_student_contact sc where sc.student_id=a.student_id) as contact_info
         from sc_student a left join sc_school b on a.school_id=b.school_id
-        where a.delete_flag='0'
+        where a.delete_flag='0' and a.tenant_id=#{reqSearchScStudent.tenantId}
         <if test="reqSearchScStudent.schoolId != null and reqSearchScStudent.schoolId != ''">
             and a.school_id = #{reqSearchScStudent.schoolId}
         </if>