Compare commits
No commits in common. '76259580cd84b039901cd22f2fa281901b53b18c' and '1d913c9a4f172044077deae3f4d72bf219f0e9f0' have entirely different histories.
76259580cd
...
1d913c9a4f
@ -1,8 +1,8 @@
|
|||||||
package com.ruoyi.web.controller.school.order;
|
package cn.xluobo.business.report.dashboard.controller;
|
||||||
|
|
||||||
import com.ruoyi.core.api.APIResponse;
|
import cn.xluobo.business.report.dashboard.domain.resp.DashboardData;
|
||||||
import com.ruoyi.school.dashboard.domain.resp.DashboardData;
|
import cn.xluobo.business.report.dashboard.service.DashboardService;
|
||||||
import com.ruoyi.school.dashboard.service.DashboardService;
|
import cn.xluobo.core.api.APIResponse;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.ruoyi.web.controller.school.course;
|
package cn.xluobo.business.sc.base.controller;
|
||||||
|
|
||||||
import com.ruoyi.school.room.domain.req.ReqRoomSelect;
|
import cn.xluobo.business.sc.base.domain.req.ReqRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.req.ReqSearchScRoom;
|
import cn.xluobo.business.sc.base.domain.req.ReqSearchScRoom;
|
||||||
import com.ruoyi.school.room.domain.ScRoom;
|
import cn.xluobo.business.sc.base.repo.model.ScRoom;
|
||||||
import com.ruoyi.school.room.service.BusinessScRoomService;
|
import cn.xluobo.business.sc.base.service.BusinessScRoomService;
|
||||||
import com.ruoyi.core.api.APIResponse;
|
import cn.xluobo.core.api.APIResponse;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.room.domain.req;
|
package cn.xluobo.business.sc.base.domain.req;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.room.domain.req;
|
package cn.xluobo.business.sc.base.domain.req;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.room.domain.req;
|
package cn.xluobo.business.sc.base.domain.req;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqPageBase;
|
import cn.xluobo.core.page.ReqPageBase;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.room.domain.req;
|
package cn.xluobo.business.sc.base.domain.req;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqPageBase;
|
import cn.xluobo.core.page.ReqPageBase;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.room.domain.resp;
|
package cn.xluobo.business.sc.base.domain.resp;
|
||||||
|
|
||||||
import com.ruoyi.school.room.domain.ScRoom;
|
import cn.xluobo.business.sc.base.repo.model.ScRoom;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.room.domain.resp;
|
package cn.xluobo.business.sc.base.domain.resp;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.room.domain.resp;
|
package cn.xluobo.business.sc.base.domain.resp;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.ruoyi.school.room.mapper;
|
package cn.xluobo.business.sc.base.repo.mapper;
|
||||||
|
|
||||||
import com.ruoyi.school.room.domain.req.ReqRoomSelect;
|
import cn.xluobo.business.sc.base.domain.req.ReqRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.req.ReqSearchScRoom;
|
import cn.xluobo.business.sc.base.domain.req.ReqSearchScRoom;
|
||||||
import com.ruoyi.school.room.domain.resp.RespRoomInfo;
|
import cn.xluobo.business.sc.base.domain.resp.RespRoomInfo;
|
||||||
import com.ruoyi.school.room.domain.resp.RespRoomSelect;
|
import cn.xluobo.business.sc.base.domain.resp.RespRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.ScRoom;
|
import cn.xluobo.business.sc.base.repo.model.ScRoom;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.room.domain;
|
package cn.xluobo.business.sc.base.repo.model;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
@ -1,19 +1,19 @@
|
|||||||
package com.ruoyi.school.room.service;
|
package cn.xluobo.business.sc.base.service;
|
||||||
|
|
||||||
import com.ruoyi.school.course.domain.ScClaTime;
|
import cn.xluobo.business.sc.base.domain.req.ReqRoomSelect;
|
||||||
import com.ruoyi.school.course.service.IScClaTimeService;
|
import cn.xluobo.business.sc.base.domain.req.ReqSearchScRoom;
|
||||||
import com.ruoyi.school.room.domain.req.ReqRoomSelect;
|
import cn.xluobo.business.sc.base.domain.resp.RespRoomInfo;
|
||||||
import com.ruoyi.school.room.domain.req.ReqSearchScRoom;
|
import cn.xluobo.business.sc.base.domain.resp.RespRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.resp.RespRoomInfo;
|
import cn.xluobo.business.sc.base.repo.mapper.ScRoomMapper;
|
||||||
import com.ruoyi.school.room.domain.resp.RespRoomSelect;
|
import cn.xluobo.business.sc.base.repo.model.ScRoom;
|
||||||
import com.ruoyi.school.room.mapper.ScRoomMapper;
|
import cn.xluobo.business.sc.course.repo.model.ScClaTime;
|
||||||
import com.ruoyi.school.room.domain.ScRoom;
|
import cn.xluobo.business.sc.course.service.IScClaTimeService;
|
||||||
|
import cn.xluobo.core.api.APIResponse;
|
||||||
|
import cn.xluobo.core.api.ApiResEnums;
|
||||||
|
import cn.xluobo.core.page.RespPage;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||||
import com.ruoyi.common.page.RespPage;
|
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import com.ruoyi.core.api.APIResponse;
|
|
||||||
import com.ruoyi.core.api.ApiResEnums;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.ruoyi.school.room.service;
|
package cn.xluobo.business.sc.base.service;
|
||||||
|
|
||||||
import com.ruoyi.school.room.domain.req.ReqRoomSelect;
|
import cn.xluobo.business.sc.base.domain.req.ReqRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.resp.RespRoomSelect;
|
import cn.xluobo.business.sc.base.domain.resp.RespRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.ScRoom;
|
import cn.xluobo.business.sc.base.repo.model.ScRoom;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.ruoyi.school.room.service.impl;
|
package cn.xluobo.business.sc.base.service.impl;
|
||||||
|
|
||||||
import com.ruoyi.school.room.mapper.ScRoomMapper;
|
import cn.xluobo.business.sc.base.domain.req.ReqRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.req.ReqRoomSelect;
|
import cn.xluobo.business.sc.base.domain.resp.RespRoomSelect;
|
||||||
import com.ruoyi.school.room.domain.resp.RespRoomSelect;
|
import cn.xluobo.business.sc.base.repo.mapper.ScRoomMapper;
|
||||||
import com.ruoyi.school.room.domain.ScRoom;
|
import cn.xluobo.business.sc.base.repo.model.ScRoom;
|
||||||
import com.ruoyi.school.room.service.IScRoomService;
|
import cn.xluobo.business.sc.base.service.IScRoomService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -1,11 +1,11 @@
|
|||||||
package com.ruoyi.web.controller.school.course;
|
package cn.xluobo.business.sc.course.controller;
|
||||||
|
|
||||||
import com.ruoyi.common.page.RespPage;
|
import cn.xluobo.business.sc.course.domain.req.time.ReqSearchScClaTimeAttend;
|
||||||
import com.ruoyi.school.course.domain.req.time.ReqSearchScClaTimeAttend;
|
import cn.xluobo.business.sc.course.domain.resp.time.RespClaTimeAttend;
|
||||||
import com.ruoyi.school.course.domain.resp.time.RespClaTimeAttend;
|
import cn.xluobo.business.sc.course.repo.model.ScClaTimeAttend;
|
||||||
import com.ruoyi.school.course.domain.ScClaTimeAttend;
|
import cn.xluobo.business.sc.course.service.BusinessScClaTimeAttendService;
|
||||||
import com.ruoyi.school.course.service.BusinessScClaTimeAttendService;
|
import cn.xluobo.core.api.APIResponse;
|
||||||
import com.ruoyi.core.api.APIResponse;
|
import cn.xluobo.core.page.RespPage;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -1,9 +1,9 @@
|
|||||||
package com.ruoyi.web.controller.school.course;
|
package cn.xluobo.business.sc.course.controller;
|
||||||
|
|
||||||
import com.ruoyi.school.course.domain.req.time.ReqSearchScClaTimeRule;
|
import cn.xluobo.business.sc.course.domain.req.time.ReqSearchScClaTimeRule;
|
||||||
import com.ruoyi.school.course.domain.ScClaTimeRule;
|
import cn.xluobo.business.sc.course.repo.model.ScClaTimeRule;
|
||||||
import com.ruoyi.school.course.service.BusinessClaTimeRuleService;
|
import cn.xluobo.business.sc.course.service.BusinessClaTimeRuleService;
|
||||||
import com.ruoyi.core.api.APIResponse;
|
import cn.xluobo.core.api.APIResponse;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -0,0 +1,93 @@
|
|||||||
|
package cn.xluobo.business.sc.course.controller;
|
||||||
|
|
||||||
|
import cn.xluobo.business.sc.course.domain.req.ReqSearchScCourseType;
|
||||||
|
import cn.xluobo.business.sc.course.repo.model.ScCourseType;
|
||||||
|
import cn.xluobo.business.sc.course.service.BusinessScCourseTypeService;
|
||||||
|
import cn.xluobo.core.api.APIResponse;
|
||||||
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||||
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* 课程类型 Controller
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author zhangby
|
||||||
|
* @since 2020-07-09 08:10:25
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/sc/course/type")
|
||||||
|
public class ScCourseTypeController {
|
||||||
|
@Autowired
|
||||||
|
private BusinessScCourseTypeService scCourseTypeService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 列表
|
||||||
|
*
|
||||||
|
* @param reqSearchScCourseType
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/list/searchList")
|
||||||
|
public APIResponse searchList(ReqSearchScCourseType reqSearchScCourseType) {
|
||||||
|
return scCourseTypeService.searchList(reqSearchScCourseType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* select
|
||||||
|
*
|
||||||
|
* @param reqSearchScCourseType
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/list/select")
|
||||||
|
public APIResponse select(ReqSearchScCourseType reqSearchScCourseType) {
|
||||||
|
return scCourseTypeService.select(reqSearchScCourseType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 详情
|
||||||
|
*
|
||||||
|
* @param courseTypeId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/info/detailById/{courseTypeId}")
|
||||||
|
public APIResponse detailById(@PathVariable("courseTypeId") Long courseTypeId) {
|
||||||
|
return scCourseTypeService.detailById(courseTypeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 添加
|
||||||
|
*
|
||||||
|
* @param scCourseType
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/add/addScCourseType")
|
||||||
|
public APIResponse addScCourseType(@RequestBody ScCourseType scCourseType) {
|
||||||
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
|
scCourseType.setTenantId(loginUser.getNowTenantId());
|
||||||
|
return scCourseTypeService.addScCourseType(scCourseType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改
|
||||||
|
*
|
||||||
|
* @param scCourseType
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/update/updateScCourseType")
|
||||||
|
public APIResponse updateScCourseType(@RequestBody ScCourseType scCourseType) {
|
||||||
|
return scCourseTypeService.updateScCourseType(scCourseType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除
|
||||||
|
*
|
||||||
|
* @param courseTypeIds
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@DeleteMapping("/delete/deleteById/{courseTypeIds}")
|
||||||
|
public APIResponse deleteById(@PathVariable("courseTypeIds") Long[] courseTypeIds) {
|
||||||
|
return scCourseTypeService.deleteById(courseTypeIds);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package cn.xluobo.business.sc.course.domain.req;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class ReqAddMemberChargeItem{
|
|
||||||
private Long courseTypeId;//课程类型
|
|
||||||
private BigDecimal cnt;//扣课时次数
|
|
||||||
private BigDecimal totalFee;//扣费金额
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.req.cla;
|
package cn.xluobo.business.sc.course.domain.req;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.req.course;
|
package cn.xluobo.business.sc.course.domain.req;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqPageBase;
|
import cn.xluobo.core.page.ReqPageBase;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.req.course;
|
package cn.xluobo.business.sc.course.domain.req;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.req.cla;
|
package cn.xluobo.business.sc.course.domain.req.cla;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqDeptCondition;
|
import cn.xluobo.core.page.ReqDeptCondition;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.member.domain.req;
|
package cn.xluobo.business.sc.course.domain.req.course;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.req.course;
|
package cn.xluobo.business.sc.course.domain.req.course;
|
||||||
|
|
||||||
import com.ruoyi.core.api.APIBaseResponse;
|
import cn.xluobo.core.api.APIBaseResponse;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.req.time;
|
package cn.xluobo.business.sc.course.domain.req.time;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqDeptCondition;
|
import cn.xluobo.core.page.ReqDeptCondition;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.req.time;
|
package cn.xluobo.business.sc.course.domain.req.time;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqPageBase;
|
import cn.xluobo.core.page.ReqPageBase;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.req.time;
|
package cn.xluobo.business.sc.course.domain.req.time;
|
||||||
|
|
||||||
import com.ruoyi.common.page.ReqPageBase;
|
import cn.xluobo.core.page.ReqPageBase;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.course;
|
package cn.xluobo.business.sc.course.domain.resp;
|
||||||
|
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.course;
|
package cn.xluobo.business.sc.course.domain.resp;
|
||||||
|
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.cla;
|
package cn.xluobo.business.sc.course.domain.resp;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.cla;
|
package cn.xluobo.business.sc.course.domain.resp;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,8 +1,10 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.cla;
|
package cn.xluobo.business.sc.course.domain.resp.cla;
|
||||||
|
|
||||||
import com.ruoyi.school.course.domain.ScCourseClaVo;
|
import cn.xluobo.business.sc.course.domain.resp.RespBusinessChooseCourseCharge;
|
||||||
import com.ruoyi.school.course.domain.resp.course.RespBusinessChooseCourseCharge;
|
import cn.xluobo.business.sc.course.repo.model.ScCourse;
|
||||||
import com.ruoyi.school.course.domain.resp.course.ScCourseVo;
|
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.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.course;
|
package cn.xluobo.business.sc.course.domain.resp.course;
|
||||||
|
|
||||||
import com.ruoyi.school.course.domain.req.course.ReqAddScCourse;
|
import cn.xluobo.business.sc.course.domain.req.course.ReqAddScCourse;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.time;
|
package cn.xluobo.business.sc.course.domain.resp.time;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.time;
|
package cn.xluobo.business.sc.course.domain.resp.time;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.time;
|
package cn.xluobo.business.sc.course.domain.resp.time;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.time;
|
package cn.xluobo.business.sc.course.domain.resp.time;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,5 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.time;
|
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.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.enums;
|
package cn.xluobo.business.sc.course.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 按时间收费周期枚举
|
* 按时间收费周期枚举
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.enums;
|
package cn.xluobo.business.sc.course.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 课程收费模式
|
* 课程收费模式
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.enums;
|
package cn.xluobo.business.sc.course.repo.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 到课状态
|
* 到课状态
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.enums;
|
package cn.xluobo.business.sc.course.repo.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排课 重复方式
|
* 排课 重复方式
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.enums;
|
package cn.xluobo.business.sc.course.repo.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排课 来源
|
* 排课 来源
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.enums;
|
package cn.xluobo.business.sc.course.repo.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排课 状态
|
* 排课 状态
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.ruoyi.school.course.mapper;
|
package cn.xluobo.business.sc.course.repo.mapper;
|
||||||
|
|
||||||
|
import cn.xluobo.business.sc.course.domain.req.time.ReqSearchScClaTimeRule;
|
||||||
|
import cn.xluobo.business.sc.course.domain.resp.time.RespClaTimeRule;
|
||||||
|
import cn.xluobo.business.sc.course.repo.model.ScClaTimeRule;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.ruoyi.school.course.domain.ScClaTimeRule;
|
|
||||||
import com.ruoyi.school.course.domain.req.time.ReqSearchScClaTimeRule;
|
|
||||||
import com.ruoyi.school.course.domain.resp.time.RespClaTimeRule;
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package cn.xluobo.business.sc.course.repo.mapper;
|
||||||
|
|
||||||
|
import cn.xluobo.business.sc.course.repo.model.ScCourseCharge;
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* 课程收费模式 Mapper 接口
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author zhangby
|
||||||
|
* @since 2020-07-08
|
||||||
|
*/
|
||||||
|
public interface ScCourseChargeMapper extends BaseMapper<ScCourseCharge> {
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,7 +1,6 @@
|
|||||||
package com.ruoyi.school.course.mapper;
|
package cn.xluobo.business.sc.course.repo.mapper;
|
||||||
|
|
||||||
|
import cn.xluobo.business.sc.course.repo.model.ScCourseType;
|
||||||
import com.ruoyi.school.course.domain.ScCourseType;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.ruoyi.school.course.mapper.ScCourseChargeMapper">
|
<mapper namespace="cn.xluobo.business.sc.course.repo.mapper.ScCourseChargeMapper">
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
@ -0,0 +1,127 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="cn.xluobo.business.sc.course.repo.mapper.ScCourseMapper">
|
||||||
|
|
||||||
|
<select id="selectCourseList" resultType="cn.xluobo.business.sc.course.domain.resp.course.RespSearchCourse">
|
||||||
|
select a.course_id,a.course_name,
|
||||||
|
a.course_type_id,
|
||||||
|
b.course_type as course_type_name,a.teaching_mode,
|
||||||
|
(select count(1) from sc_course_cla cc where a.course_id=cc.course_id) as cla_count,
|
||||||
|
(select group_concat(distinct charge.charge_type) from sc_course_charge charge where a.course_id=charge.course_id) as charge_names,
|
||||||
|
(select group_concat(distinct charge.depart_id) from sc_course_charge charge where a.course_id=charge.course_id) as campus_ids,
|
||||||
|
a.create_time,
|
||||||
|
a.sale,
|
||||||
|
a.course_intro,
|
||||||
|
a.cla_fee
|
||||||
|
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' and a.tenant_id=#{reqSearchScCourse.tenantId}
|
||||||
|
<if test="reqSearchScCourse.courseName != null and reqSearchScCourse.courseName != ''">
|
||||||
|
and a.course_name like concat('%',#{reqSearchScCourse.courseName} ,'%')
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.sale != null and reqSearchScCourse.sale != ''">
|
||||||
|
and a.sale = #{reqSearchScCourse.sale}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.courseTypeId != null and reqSearchScCourse.courseTypeId != ''">
|
||||||
|
and a.course_type_id = #{reqSearchScCourse.courseTypeId}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.teachingMode != null and reqSearchScCourse.teachingMode != ''">
|
||||||
|
and a.teaching_mode = #{reqSearchScCourse.teachingMode}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.departId != null">
|
||||||
|
and exists(select 1 from sc_course_charge c where a.course_id=c.course_id and (c.depart_id=#{reqSearchScCourse.departId} or c.depart_id=-1))
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.chargeType != null and reqSearchScCourse.chargeType != ''">
|
||||||
|
and exists(select 1 from sc_course_charge c where a.course_id=c.course_id and c.charge_type=#{reqSearchScCourse.chargeType} )
|
||||||
|
</if>
|
||||||
|
order by a.sale desc,a.create_time desc
|
||||||
|
</select>
|
||||||
|
<select id="selectCourseListWithStudentCourse" resultType="cn.xluobo.business.sc.course.domain.resp.course.RespSearchCourse">
|
||||||
|
select a.course_id,a.course_name,b.course_type as course_type_name,a.teaching_mode,
|
||||||
|
(select count(1) from sc_course_cla cc where a.course_id=cc.course_id) as cla_count,
|
||||||
|
(select group_concat(distinct charge.charge_type) from sc_course_charge charge where a.course_id=charge.course_id) as charge_names,
|
||||||
|
(select group_concat(distinct charge.depart_id) from sc_course_charge charge where a.course_id=charge.course_id) as campus_ids,
|
||||||
|
a.create_time,
|
||||||
|
a.sale,
|
||||||
|
a.course_intro,
|
||||||
|
c.student_course_id
|
||||||
|
from sc_course a
|
||||||
|
left join sc_course_type b on a.course_type_id = b.course_type_id and b.in_use='1'
|
||||||
|
left join sc_student_course c on a.course_id=c.course_id and c.student_id = #{reqSearchScCourse.studentId}
|
||||||
|
where a.delete_flag='0' and a.tenant_id=#{tenantId}
|
||||||
|
<if test="reqSearchScCourse.courseName != null and reqSearchScCourse.courseName != ''">
|
||||||
|
and a.course_name like concat('%',#{reqSearchScCourse.courseName} ,'%')
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.sale != null and reqSearchScCourse.sale != ''">
|
||||||
|
and a.sale = #{reqSearchScCourse.sale}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.courseTypeId != null and reqSearchScCourse.courseTypeId != ''">
|
||||||
|
and a.course_type_id = #{reqSearchScCourse.courseTypeId}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.teachingMode != null and reqSearchScCourse.teachingMode != ''">
|
||||||
|
and a.teaching_mode = #{reqSearchScCourse.teachingMode}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.departId != null">
|
||||||
|
and exists(select 1 from sc_course_charge c where a.course_id=c.course_id and (c.depart_id=#{reqSearchScCourse.departId} or c.depart_id=-1))
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.chargeType != null and reqSearchScCourse.chargeType != ''">
|
||||||
|
and exists(select 1 from sc_course_charge c where a.course_id=c.course_id and c.charge_type=#{reqSearchScCourse.chargeType} )
|
||||||
|
</if>
|
||||||
|
order by a.sale desc,a.create_time desc
|
||||||
|
</select>
|
||||||
|
<select id="selectCourseForExport" resultType="cn.xluobo.business.sc.course.domain.export.ExpCourse">
|
||||||
|
select a.course_id,
|
||||||
|
b.charge_id,
|
||||||
|
a.course_name,
|
||||||
|
(select t.course_type from sc_course_type t where t.course_type_id=a.course_type_id) course_type_name,
|
||||||
|
fcn_dict_name(a.teaching_mode,'teaching_mode') as teaching_mode,
|
||||||
|
a.create_time,
|
||||||
|
fcn_dict_name(a.sale,'sale') as sale,
|
||||||
|
a.course_intro,
|
||||||
|
case b.depart_id when -1 then '全部校区' else (select t.dept_name from sys_dept t where t.dept_id=b.depart_id) end depart_name,
|
||||||
|
b.charge_type,fcn_dict_name(b.charge_type,'charge_type') as charge_type_name,
|
||||||
|
b.date_unit,
|
||||||
|
fcn_dict_name(b.date_unit,'date_unit') as date_unit_name,
|
||||||
|
b.count,b.total_fee
|
||||||
|
from sc_course a,sc_course_charge b
|
||||||
|
where a.course_id=b.course_id and a.delete_flag='0'
|
||||||
|
<if test="reqSearchScCourse.courseName != null and reqSearchScCourse.courseName != ''">
|
||||||
|
and a.course_name like concat('%',#{reqSearchScCourse.courseName} ,'%')
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.sale != null and reqSearchScCourse.sale != ''">
|
||||||
|
and a.sale = #{reqSearchScCourse.sale}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.courseTypeId != null and reqSearchScCourse.courseTypeId != ''">
|
||||||
|
and a.course_type_id = #{reqSearchScCourse.courseTypeId}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.teachingMode != null and reqSearchScCourse.teachingMode != ''">
|
||||||
|
and a.teaching_mode = #{reqSearchScCourse.teachingMode}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.departId != null">
|
||||||
|
and b.depart_id=#{reqSearchScCourse.departId}
|
||||||
|
</if>
|
||||||
|
<if test="reqSearchScCourse.chargeType != null and reqSearchScCourse.chargeType != ''">
|
||||||
|
and b.charge_type=#{reqSearchScCourse.chargeType}
|
||||||
|
</if>
|
||||||
|
order by a.sale desc,a.create_time desc limit 2000
|
||||||
|
</select>
|
||||||
|
<select id="selectCourseCount" resultType="java.lang.Integer">
|
||||||
|
select count(1) from sc_course a
|
||||||
|
where 1=1
|
||||||
|
<if test="deptId != null">
|
||||||
|
and exists(select 1 from sc_course_charge b where a.course_id=b.course_id and (b.depart_id=#{deptId} or b.depart_id=-1))
|
||||||
|
</if>
|
||||||
|
<if test="deptId == null and userId != null and userId != ''">
|
||||||
|
and (
|
||||||
|
exists(select 1 from sc_course_charge b,sys_user_dept ud
|
||||||
|
where ud.user_id=#{userId}
|
||||||
|
and (ud.dept_id=b.depart_id or ud.dept_id=-1)
|
||||||
|
and a.course_id=b.course_id)
|
||||||
|
or exists(select 1 from sc_course_charge b where a.course_id=b.course_id and b.depart_id=-1)
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
|
<select id="selectTenantCourseCount" resultType="java.lang.Integer">
|
||||||
|
select count(1) from sc_course where tenant_id=#{tenantId}
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.ruoyi.school.course.mapper.ScCourseTypeMapper">
|
<mapper namespace="cn.xluobo.business.sc.course.repo.mapper.ScCourseTypeMapper">
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.ruoyi.school.course.domain.req.course;
|
package cn.xluobo.business.sc.course.repo.model;
|
||||||
|
|
||||||
|
import cn.xluobo.business.sc.course.enums.ChargeDateUnitEnum;
|
||||||
|
import cn.xluobo.business.sc.course.enums.CourseChargeTypeEnum;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.ruoyi.school.course.enums.ChargeDateUnitEnum;
|
|
||||||
import com.ruoyi.school.course.enums.CourseChargeTypeEnum;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.ruoyi.school.course.domain;
|
package cn.xluobo.business.sc.course.repo.model;
|
||||||
|
|
||||||
import com.ruoyi.core.api.APIBaseResponse;
|
import cn.xluobo.core.api.APIBaseResponse;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.ruoyi.school.course.domain.resp.course;
|
package cn.xluobo.business.sc.course.repo.model;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.ruoyi.school.course.service;
|
package cn.xluobo.business.sc.course.service;
|
||||||
|
|
||||||
import com.ruoyi.school.course.domain.req.time.ReqClaTimeCount;
|
import cn.xluobo.business.sc.course.domain.req.time.ReqClaTimeCount;
|
||||||
import com.ruoyi.school.course.domain.ScClaTimeAttend;
|
import cn.xluobo.business.sc.course.repo.model.ScClaTimeAttend;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.ruoyi.school.course.service;
|
package cn.xluobo.business.sc.course.service;
|
||||||
|
|
||||||
import com.ruoyi.school.course.domain.req.time.ReqSearchScClaTimeRule;
|
import cn.xluobo.business.sc.course.domain.req.time.ReqSearchScClaTimeRule;
|
||||||
import com.ruoyi.school.course.domain.resp.time.RespClaTimeRule;
|
import cn.xluobo.business.sc.course.domain.resp.time.RespClaTimeRule;
|
||||||
import com.ruoyi.school.course.domain.ScClaTimeRule;
|
import cn.xluobo.business.sc.course.repo.model.ScClaTimeRule;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -1,9 +1,8 @@
|
|||||||
package com.ruoyi.school.course.service;
|
package cn.xluobo.business.sc.course.service;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.xluobo.business.sc.course.domain.resp.RespBusinessChooseCourseCharge;
|
||||||
|
import cn.xluobo.business.sc.course.repo.model.ScCourseCharge;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.ruoyi.school.course.domain.resp.course.RespBusinessChooseCourseCharge;
|
|
||||||
import com.ruoyi.school.course.domain.req.course.ScCourseCharge;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue