修正bug

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

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqSearchScCourse.java

@@ -1,6 +1,7 @@
 package cn.xluobo.business.sc.course.domain.req;
 
 import cn.xluobo.core.page.ReqPageBase;
+import com.ruoyi.common.utils.SecurityUtils;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -44,4 +45,10 @@ public class ReqSearchScCourse extends ReqPageBase implements Serializable {
      * 学生 区分结果是否为续费
      */
     private Long studentId;
+
+    private String tenantId;
+
+    public String getTenantId(){
+        return SecurityUtils.getLoginUser().getNowTenantId();
+    }
 }

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqSearchScCourseCla.java

@@ -11,8 +11,8 @@ import java.io.Serializable;
  */
 @Data
 public class ReqSearchScCourseCla extends ReqPageBase implements Serializable {
-    private Long courseId;
+    private String courseId;
-    private Long staffId;
+    private String staffId;
     private String claName;
     private String courseTime;
     private Long departId;
@@ -20,4 +20,6 @@ public class ReqSearchScCourseCla extends ReqPageBase implements Serializable {
      * 收费模式
      */
     private String chargeType;
+
+    private String tenantId;
 }

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/course/ReqAddScCourseChargeItem.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 @Data
 public class ReqAddScCourseChargeItem {
 
-    private Long chargeId;
+    private String chargeId;
 
     /**
      * 校区id

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) {

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;

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespCourseClaInfo.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class RespCourseClaInfo {
 
-    private Long claId;
+    private String claId;
 
     private String claName;
 
@@ -24,13 +24,13 @@ public class RespCourseClaInfo {
 
     private String openDate;
 
-    private Long courseId;
+    private String courseId;
 
     private String courseName;
 
     private Long staffId;
 
-    private String staffName;
+    private String teacherName;
 
     private String deptName;
 

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/cla/RespClaAllDetailInfo.java

@@ -3,6 +3,8 @@ package cn.xluobo.business.sc.course.domain.resp.cla;
 import cn.xluobo.business.sc.course.domain.resp.RespBusinessChooseCourseCharge;
 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.ScCourseClaVo;
+import cn.xluobo.business.sc.course.repo.model.ScCourseVo;
 import lombok.Builder;
 import lombok.Data;
 
@@ -18,10 +20,10 @@ import java.util.List;
 public class RespClaAllDetailInfo {
 
     // 班级信息
-    private ScCourseCla courseCla;
+    private ScCourseClaVo courseCla;
 
     // 课程信息
-    private ScCourse course;
+    private ScCourseVo course;
 
     // 收费方式
     private List<RespBusinessChooseCourseCharge> courseChargeList;

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/course/RespScCourseDetail.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 public class RespScCourseDetail extends ReqAddScCourse {
 
-    private Long courseId;
+    private String courseId;
 
     private String courseTypeName;
 

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

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;
 

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

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

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>

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.staff_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_staff d
+        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.staff_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>

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScCourseClaMapper.xml

@@ -8,7 +8,7 @@
             (select count(1) from sc_student_course sc where sc.cla_id=a.cla_id and sc.status='1') as student_cnt,
             a.capacity,a.recruit_status,a.open_date,
             b.course_id,b.course_name,
-            c.staff_id,c.staff_name,
+            a.staff_id,a.teacher_name,
             sd.dept_name,
             (select group_concat(fcn_dict_name_list(r.week_day,'week_day'),' ',substr(r.start_time,1,5),'~',substr(r.end_time,1,5),' (',r.begin_date,'~',r.end_date,')' SEPARATOR ';')
                 from sc_cla_time_rule r
@@ -18,9 +18,8 @@
                   and (date_format(now(),'%Y-%m-%d') between r.begin_date and r.end_date or date_format(now(),'%Y-%m-%d') <![CDATA[ < ]]> r.begin_date)) as week_day
         from sc_course_cla a
             left join sc_course b on a.course_id=b.course_id
-            left join sys_staff c on a.staff_id=c.staff_id
             left join sys_dept sd on a.depart_id=sd.dept_id
-        where a.delete_flag='0'
+        where a.delete_flag='0' and a.tenant_id=#{reqSearchScCourseCla.tenantId}
         <if test="reqSearchScCourseCla.courseId != null">
             and a.course_id=#{reqSearchScCourseCla.courseId}
         </if>
@@ -44,6 +43,7 @@
         and a.delete_flag='0'
         order by a.create_time desc
     </select>
+
     <select id="selectForSelect" resultType="cn.xluobo.business.sc.course.domain.resp.RespCourseClaSelectInfo">
         select a.cla_id,a.cla_name,b.course_id,b.course_name,c.staff_name,
                dept.dept_id,

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScCourseMapper.xml

@@ -14,7 +14,7 @@
                a.course_intro
         from sc_course a
                  left join sc_course_type b on a.course_type_id = b.course_type_id and b.in_use='1'
-        where a.delete_flag='0'
+        where a.delete_flag='0' and a.tenant_id=#{reqSearchScCourse.tenantId}
         <if test="reqSearchScCourse.courseName != null and reqSearchScCourse.courseName != ''">
             and a.course_name like concat('%',#{reqSearchScCourse.courseName} ,'%')
         </if>

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTimeRule.java

@@ -175,15 +175,10 @@ public class ScClaTimeRule implements Serializable {
         }
         if (ClaTimeRepeatTypeEnums.EVERY_WEEK.getRepeatType().equals(repeatType)
                 || ClaTimeRepeatTypeEnums.EVERY_SECOND_WEEK.getRepeatType().equals(repeatType)) {
-            if (StringUtils.isAnyEmpty(weekDay, startTime, endTime, beginDate, endDate)) {
+            return !StringUtils.isAnyEmpty(startTime, endTime, beginDate, endDate);
-                return false;
-            }
         } else {
-            if (StringUtils.isAnyEmpty(startTime, endTime)) {
+            return !StringUtils.isAnyEmpty(startTime, endTime);
-                return false;
-            }
         }
-        return true;
     }
 
 

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

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

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseCla.java

@@ -4,6 +4,7 @@ import cn.xluobo.core.api.APIBaseResponse;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.utils.SecurityUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -146,13 +147,16 @@ public class ScCourseCla implements Serializable {
     @TableField(exist = false)
     private String deptName;
 
-    @TableField(exist = false)
     private String teacherName;
 
     // 当前班级人数
     @TableField(exist = false)
     private Integer studentCnt;
 
+    public String getTenantId(){
+        return SecurityUtils.getLoginUser().getNowTenantId();
+    }
+
     /**
      * 校验参数
      * @return

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseClaVo.java

@@ -0,0 +1,175 @@
+package cn.xluobo.business.sc.course.repo.model;
+
+import cn.xluobo.core.api.APIBaseResponse;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.utils.SecurityUtils;
+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-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sc_course_cla")
+public class ScCourseClaVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 班级id
+     */
+    @TableId(value = "cla_id")
+    private String claId;
+
+    /**
+     * 所属租户
+     */
+    @TableField("tenant_id")
+    private String tenantId;
+
+    /**
+     * 课程id
+     */
+    @TableField("course_id")
+    private String courseId;
+
+    /**
+     * 开班校区
+     */
+    @TableField("depart_id")
+    private Long departId;
+
+    /**
+     * 班主任id
+     */
+    @TableField("staff_id")
+    private Long staffId;
+
+    /**
+     * 班级名称
+     */
+    @TableField("cla_name")
+    private String claName;
+
+    /**
+     * 班级颜色
+     */
+    @TableField("cla_color")
+    private String claColor;
+
+    /**
+     * 满班人数
+     */
+    @TableField("capacity")
+    private Integer capacity;
+
+    /**
+     * 招生状态 1开放 2满班后停止 0停止
+     */
+    @TableField("recruit_status")
+    private String recruitStatus;
+
+    /**
+     * 每次上课学生扣除课时
+     */
+    @TableField("every_stu_lose_hour")
+    private BigDecimal everyStuLoseHour;
+
+    /**
+     * 每次上课教师获得课时
+     */
+    @TableField("every_tea_get_hour")
+    private BigDecimal everyTeaGetHour;
+
+    /**
+     * 开班日期
+     */
+    @TableField("open_date")
+    private String openDate;
+
+    /**
+     * 结班日期
+     */
+    @TableField("close_date")
+    private String closeDate;
+
+    /**
+     * 备注
+     */
+    @TableField("memo")
+    private String memo;
+
+    /**
+     * 删除标志（1删除 0在用）
+     */
+    @TableField("delete_flag")
+    private String deleteFlag;
+
+    /**
+     * 创建者
+     */
+    @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 deptName;
+
+    @TableField(exist = false)
+    private String teacherName;
+
+    // 当前班级人数
+    @TableField(exist = false)
+    private Integer studentCnt;
+
+    public String getTenantId(){
+        return SecurityUtils.getLoginUser().getNowTenantId();
+    }
+
+    /**
+     * 校验参数
+     * @return
+     */
+    public APIBaseResponse checkParam(){
+        if(StringUtils.isAnyEmpty(claName,claColor,recruitStatus,openDate)){
+            return APIBaseResponse.fail("请求参数错误,请全部填写后,重新提交");
+        }
+        if(null == courseId || null == departId || null == staffId || null == capacity || null == everyStuLoseHour || null == everyTeaGetHour){
+            return APIBaseResponse.fail("请求参数错误,请全部填写后,重新提交");
+        }
+        return APIBaseResponse.success();
+    }
+
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScCourseVo.java

@@ -0,0 +1,111 @@
+package cn.xluobo.business.sc.course.repo.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 课程信息
+ * </p>
+ *
+ * @author zhangby
+ * @since 2020-03-17 11:25:55
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sc_course")
+public class ScCourseVo implements Serializable {
+
+
+    /**
+     * 课程id
+     */
+    @TableId(value = "course_id")
+    private String courseId;
+
+    /**
+     * 所属租户
+     */
+    @TableField("tenant_id")
+    private String tenantId;
+
+    /**
+     * 课程名称
+     */
+    @TableField("course_name")
+    private String courseName;
+
+    /**
+     * 课程类型
+     */
+    @TableField("course_type_id")
+    private String courseTypeId;
+
+    /**
+     * 授课模式 1 班课 2 一对一
+     */
+    @TableField("teaching_mode")
+    private String teachingMode;
+
+    /**
+     * 课程简介
+     */
+    @TableField("course_intro")
+    private String courseIntro;
+
+    /**
+     * 是否在售 1在售 0停售
+     */
+    @TableField("sale")
+    private String sale;
+
+    /**
+     * 删除标志（1删除 0在用）
+     */
+    @TableField("delete_flag")
+    @TableLogic
+    private String deleteFlag;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("last_update_user")
+    @JsonIgnore
+    private Long lastUpdateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField("last_update_time")
+    @JsonIgnore
+    private Date lastUpdateTime;
+
+    /**
+     * 导入id
+     */
+    @TableField(value = "import_id")
+    @JsonIgnore
+    private Long importId;
+}

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

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

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseClaService.java

@@ -1,14 +1,13 @@
 package cn.xluobo.business.sc.course.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.xluobo.business.sc.course.domain.req.ReqAddScCourseCla;
 import cn.xluobo.business.sc.course.domain.req.ReqSearchScCourseCla;
 import cn.xluobo.business.sc.course.domain.resp.RespBusinessChooseCourseCharge;
 import cn.xluobo.business.sc.course.domain.resp.RespCourseClaInfo;
 import cn.xluobo.business.sc.course.domain.resp.cla.RespClaAllDetailInfo;
 import cn.xluobo.business.sc.course.repo.mapper.ScCourseClaMapper;
-import cn.xluobo.business.sc.course.repo.model.ScClaTime;
+import cn.xluobo.business.sc.course.repo.model.*;
-import cn.xluobo.business.sc.course.repo.model.ScCourse;
-import cn.xluobo.business.sc.course.repo.model.ScCourseCla;
 import cn.xluobo.business.sc.student.repo.mapper.ScStudentMapper;
 import cn.xluobo.business.sc.student.repo.model.ScStudentCourse;
 import cn.xluobo.business.sc.student.service.IScStudentCourseService;
@@ -23,8 +22,10 @@ import cn.xluobo.core.page.RespPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Maps;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +66,9 @@ public class BusinessScCourseClaService {
     @Autowired
     private IScClaTimeService claTimeService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询
      *
@@ -73,6 +77,8 @@ public class BusinessScCourseClaService {
      */
     public APIResponse searchList(ReqSearchScCourseCla reqSearchScCourseCla) {
         RespPage<RespCourseClaInfo> page = new RespPage(reqSearchScCourseCla.getPageNum(), reqSearchScCourseCla.getPageSize());
+        String nowTenantId = SecurityUtils.getLoginUser().getNowTenantId();
+        reqSearchScCourseCla.setTenantId(nowTenantId);
         List<RespCourseClaInfo> claList = scCourseClaMapper.selectClaList(reqSearchScCourseCla, page);
         page.setRows(claList);
         return APIResponse.toAPIResponse(page);
@@ -91,17 +97,28 @@ public class BusinessScCourseClaService {
         Map<String, Object> resultMap = Maps.newHashMap();
         // 班级信息
         ScCourseCla detailInfo = scCourseClaService.getById(claId);
+
         if (null == detailInfo) {
             return APIResponse.toAPIResponse(null);
         }
+
+        ScCourseClaVo scCourseCla = new ScCourseClaVo();
+        BeanUtil.copyProperties(detailInfo,scCourseCla);
+        scCourseCla.setClaId(detailInfo.getClaId().toString());
+        scCourseCla.setCourseId(detailInfo.getCourseId().toString());
         // 课程信息
         ScCourse scCourse = courseService.getById(detailInfo.getCourseId());
+
+        ScCourseVo scCourseVo = new ScCourseVo();
+        BeanUtil.copyProperties(scCourse,scCourseVo);
+        scCourseVo.setCourseId(scCourse.getCourseId().toString());
+
         // 是否允许变更课程，有报名不允许变更课程
         APIBaseResponse canChangeCourse = scCourseClaService.canChangeCourse(claId);
         resultMap.put("canChangeCourse", canChangeCourse.isSuccess());
 
-        resultMap.put("claInfo", detailInfo);
+        resultMap.put("claInfo", scCourseCla);
-        resultMap.put("claCourseInfo", scCourse);
+        resultMap.put("claCourseInfo", scCourseVo);
 
         return APIResponse.toAPIResponse(resultMap);
     }
@@ -118,17 +135,25 @@ public class BusinessScCourseClaService {
         }
         // 班级信息
         ScCourseCla courseCla = scCourseClaService.getById(claId);
+
         if (null == courseCla) {
             return null;
         }
 
+        ScCourseClaVo scCourseClaVo = new ScCourseClaVo();
+        BeanUtil.copyProperties(courseCla,scCourseClaVo);
+        scCourseClaVo.setClaId(courseCla.getClaId().toString());
+
         // 班级当前学员数量
         Integer studentCnt = scCourseClaService.selectStudentCnt(claId);
-        courseCla.setStudentCnt(studentCnt);
+        scCourseClaVo.setStudentCnt(studentCnt);
 
         // 课程信息
         ScCourse scCourse = courseService.getById(courseCla.getCourseId());
 
+        ScCourseVo scCourseVo = new ScCourseVo();
+        BeanUtil.copyProperties(scCourse,scCourseVo);
+        scCourseVo.setCourseId(scCourse.getCourseId().toString());
 
         // 课程收费信息
         List<RespBusinessChooseCourseCharge> courseChargeList = courseChargeService.courseChargeList(scCourse.getCourseId(), null);
@@ -141,16 +166,16 @@ public class BusinessScCourseClaService {
 
         // 教师
         if (null != courseCla.getStaffId()) {
-            SysStaff staff = teacherService.getById(courseCla.getStaffId());
+            SysUser staff = userService.selectUserById(courseCla.getStaffId());
-            courseCla.setTeacherName(staff.getStaffName());
+            courseCla.setTeacherName(staff.getNickName());
         }
 
         // 上课时间
         List<String> claTimeInfo = claTimeRuleService.selectClaTimeInfo(claId);
 
         return RespClaAllDetailInfo.builder()
-                .courseCla(courseCla)
+                .courseCla(scCourseClaVo)
-                .course(scCourse)
+                .course(scCourseVo)
                 .courseChargeList(courseChargeList)
                 .claTimeList(claTimeInfo)
                 .build();
@@ -173,13 +198,14 @@ public class BusinessScCourseClaService {
         }
 
         // 教师是否存在
-        SysStaff teacher = teacherService.getById(scCourseCla.getStaffId());
+        SysUser teacher = userService.selectUserById(scCourseCla.getStaffId());
         if (null == teacher) {
             return APIResponse.toExceptionResponse("教师不存在,请重新选择后提交。");
         }
 
         // 新建班级
         ScCourseCla cla = scCourseCla.getScCourseCla(loginUser);
+        cla.setTeacherName(teacher.getNickName());
         APIBaseResponse checkParam = cla.checkParam();
         if (!checkParam.isSuccess()) {
             return APIResponse.toExceptionResponse(checkParam.getRespMsg());
@@ -213,7 +239,7 @@ public class BusinessScCourseClaService {
         }
 
         // 教师是否存在
-        SysStaff teacher = teacherService.getById(scCourseCla.getStaffId());
+        SysUser teacher = userService.selectUserById(scCourseCla.getStaffId());
         if (null == teacher) {
             return APIResponse.toExceptionResponse("教师不存在,请重新选择后提交。");
         }
@@ -227,6 +253,7 @@ public class BusinessScCourseClaService {
         }
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        scCourseCla.setTeacherName(teacher.getNickName());
         scCourseCla.setLastUpdateUser(loginUser.getUserId());
         scCourseCla.setLastUpdateTime(new Date());
         boolean updateScCourseCla = scCourseClaService.updateById(scCourseCla);

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseService.java

@@ -133,7 +133,7 @@ public class BusinessScCourseService {
 
 
         RespScCourseDetail respScCourseDetail = new RespScCourseDetail();
-        respScCourseDetail.setCourseId(detailInfo.getCourseId());
+        respScCourseDetail.setCourseId(detailInfo.getCourseId()+"");
         respScCourseDetail.setCourseName(detailInfo.getCourseName());
         respScCourseDetail.setCourseTypeId(detailInfo.getCourseTypeId());
         respScCourseDetail.setTeachingMode(detailInfo.getTeachingMode());
@@ -174,7 +174,7 @@ public class BusinessScCourseService {
                 partCampusList.add(departId.toString());
             }
             String chargeType = courseCharge.getChargeType();
-            chargeItem.setChargeId(courseCharge.getChargeId());
+            chargeItem.setChargeId(courseCharge.getChargeId()+"");
             chargeItem.setCampusId(courseCharge.getDepartId());
             chargeItem.setCampusName(campusMap.get(courseCharge.getDepartId()));
             if ("hour".equals(chargeType)) {
@@ -238,6 +238,7 @@ public class BusinessScCourseService {
         scCourse.setCourseIntro(reqAddScCourse.getCourseIntro());
         scCourse.setCreateUser(loginUser.getUserId());
         scCourse.setLastUpdateUser(loginUser.getUserId());
+        scCourse.setTenantId(loginUser.getNowTenantId());
         boolean addScCourse = scCourseService.save(scCourse);
 
         // course_charge保存
@@ -310,6 +311,9 @@ public class BusinessScCourseService {
         updateCourse.setCourseIntro(reqChangeScCourse.getCourseIntro());
         updateCourse.setLastUpdateUser(loginUser.getUserId());
         updateCourse.setLastUpdateTime(new Date());
+        updateCourse.setTenantId(loginUser.getNowTenantId());
+        updateCourse.setSale("1");
+        updateCourse.setImportId(-1L);
         boolean updateScCourse = scCourseService.updateById(updateCourse);
 
         // course_charge 删除

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/impl/ScClaTimeRuleServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -85,7 +86,7 @@ public class ScClaTimeRuleServiceImpl extends ServiceImpl<ScClaTimeRuleMapper, S
 
         // 节假日缓存
         if (null == holidayMap) {
-            holidayMap = holidayService.getHolidayMap();
+            holidayMap = new HashMap<>();
         }
 
 
@@ -239,18 +240,6 @@ public class ScClaTimeRuleServiceImpl extends ServiceImpl<ScClaTimeRuleMapper, S
         return resultClaTimeList;
     }
 
-    @Override
-    public List<RespClaTimeRule> getClaTimeListByRule(ScClaTimeRule claTimeRule, Map<String, String> holidayMap) {
-        RespClaTimeRule respClaTime = RespClaTimeRule.builder()
-                .claTimeBegin(claTimeRule.getStartTime())
-                .claTimeEnd(claTimeRule.getEndTime())
-                .build();
-
-        BeanUtils.copyProperties(claTimeRule, respClaTime);
-
-        return this.getClaTimeListByRule(respClaTime, holidayMap);
-    }
-
     @Override
     public List<String> checkDayRepeat(Long claId, String[] day, Long notEqRuleId) {
         if (null == claId || null == day || day.length == 0) {
@@ -269,6 +258,18 @@ public class ScClaTimeRuleServiceImpl extends ServiceImpl<ScClaTimeRuleMapper, S
         return list.stream().map(ScClaTime::getClaDate).collect(Collectors.toList());
     }
 
+    @Override
+    public List<RespClaTimeRule> getClaTimeListByRule(ScClaTimeRule claTimeRule, Map<String, String> holidayMap) {
+        RespClaTimeRule respClaTime = RespClaTimeRule.builder()
+                .claTimeBegin(claTimeRule.getStartTime())
+                .claTimeEnd(claTimeRule.getEndTime())
+                .build();
+
+        BeanUtils.copyProperties(claTimeRule, respClaTime);
+
+        return this.getClaTimeListByRule(respClaTime, holidayMap);
+    }
+
     @Override
     public List<String> checkDayRepeat(ScClaTimeRule claTimeRule) {
         Long claId = claTimeRule.getClaId();

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/impl/ScCourseServiceImpl.java

@@ -24,14 +24,12 @@ import java.util.List;
 @Service
 public class ScCourseServiceImpl extends ServiceImpl<ScCourseMapper, ScCourse> implements IScCourseService {
 
-    @Autowired
-    private ScCourseMapper courseMapper;
     @Autowired
     private ScCourseChargeMapper courseChargeMapper;
 
     @Override
     public RespPage<RespSearchCourse> searchCourse(ReqSearchScCourse reqSearchScCourse) {
-        RespPage respPage = new RespPage(reqSearchScCourse.getPageNum(),reqSearchScCourse.getPageSize());
+        RespPage<RespSearchCourse> respPage = new RespPage<>(reqSearchScCourse.getPageNum(),reqSearchScCourse.getPageSize());
         List<RespSearchCourse> courseList = baseMapper.selectCourseList(reqSearchScCourse, respPage);
         respPage.setRows(courseList);
         return respPage;

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

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;
 

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>

ruoyi-admin/src/main/java/cn/xluobo/business/sys/staff/controller/SysStaffController.java

@@ -5,6 +5,9 @@ import cn.xluobo.business.sys.staff.domain.req.ReqBusinessAddStaff;
 import cn.xluobo.business.sys.staff.domain.req.ReqSearchStaff;
 import cn.xluobo.business.sys.staff.service.BusinessSysStaffService;
 import cn.xluobo.core.api.APIResponse;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +27,9 @@ public class SysStaffController {
     @Autowired
     private BusinessSysStaffService sysStaffService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 列表
      *
@@ -41,8 +47,11 @@ public class SysStaffController {
      * @return
      */
     @GetMapping("/list/teacherSelect")
-    public APIResponse teacherSelect(ReqSelect reqSelect) {
+    public AjaxResult teacherSelect(ReqSelect reqSelect) {
-        return sysStaffService.teacherSelect(reqSelect);
+        SysUser sysUser = new SysUser();
+        sysUser.setTeacher(1);
+        List<SysUser> sysUsers = userService.selectUserList(sysUser);
+        return AjaxResult.success(sysUsers);
     }
 
     /**