From 76259580cd84b039901cd22f2fa281901b53b18c Mon Sep 17 00:00:00 2001 From: 15004070936 <1097449274@qq.com> Date: Thu, 12 Mar 2026 13:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B2=97=E4=BD=8D=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E8=A7=92=E8=89=B2=E7=9B=AE=E5=BD=95=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=AE=A1=E7=90=86=E5=91=98=E7=BB=9F=E4=B8=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/ScMemberCardTypesController.java | 37 +--- .../controller/system/SysPostController.java | 129 ------------ .../system/SysProfileController.java | 1 - .../controller/system/SysUserController.java | 5 - .../common/core/domain/entity/SysDept.java | 1 + .../domain/resp/time/ClaTimeCalendarItem.java | 3 + .../course/domain/resp/time/RespClaTime.java | 13 +- .../course/mapper/ScClaTimeAttendMapper.java | 1 + .../impl/ScClaTimeAttendServiceImpl.java | 5 +- .../service/impl/ScCourseTypeServiceImpl.java | 2 + .../dashboard/service/DashboardService.java | 63 ++++-- .../school/member/domain/ScMemberCard.java | 4 + .../member/domain/resp/MemberCardDTO.java | 1 + .../member/domain/resp/MemberCardVO.java | 3 +- .../member/mapper/ScMemberCardMapper.java | 5 + .../service/ScMemberCardTypesService.java | 2 +- .../service/impl/ScMemberCardServiceImpl.java | 37 ++-- .../impl/ScMemberCardTypesServiceImpl.java | 47 +++++ .../java/com/ruoyi/system/domain/SysPost.java | 133 ------------- .../ruoyi/system/mapper/SysPostMapper.java | 101 ---------- .../ruoyi/system/service/ISysPostService.java | 100 ---------- .../ruoyi/system/service/ISysUserService.java | 7 - .../service/impl/SysPostServiceImpl.java | 184 ------------------ .../service/impl/SysRoleServiceImpl.java | 2 +- .../service/impl/SysTenantServiceImpl.java | 11 +- .../service/impl/SysUserServiceImpl.java | 67 +------ .../mapper/colums/SysTeacherMapper.xml | 4 +- .../school/course/ScClaTimeAttendMapper.xml | 33 ++-- .../mapper/school/course/ScClaTimeMapper.xml | 2 + .../resources/mapper/system/SysMenuMapper.xml | 12 +- .../resources/mapper/system/SysPostMapper.xml | 130 ------------- .../resources/mapper/system/SysRoleMapper.xml | 10 +- 32 files changed, 188 insertions(+), 967 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java delete mode 100644 ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScMemberCardTypesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScMemberCardTypesController.java index a91a287..0a5c9f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScMemberCardTypesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScMemberCardTypesController.java @@ -5,13 +5,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.xluobo.core.page.RespPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.core.api.APIResponse; import com.ruoyi.school.course.domain.req.course.ReqBusinessOrderCourseDetail; import com.ruoyi.school.course.domain.resp.course.RespCourseTypeSelect; -import com.ruoyi.school.course.domain.ScCourseType; -import com.ruoyi.school.course.service.IScCourseTypeService; import com.ruoyi.school.member.domain.ScMemberCard; import com.ruoyi.school.member.domain.ScMemberCardCharge; import com.ruoyi.school.member.domain.ScMemberCardCourses; @@ -21,14 +18,12 @@ import com.ruoyi.school.member.service.IScMemberCardService; import com.ruoyi.school.member.service.ScMemberCardChargeService; import com.ruoyi.school.member.service.ScMemberCardCourseService; import com.ruoyi.school.member.service.ScMemberCardTypesService; -import com.ruoyi.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -45,17 +40,11 @@ public class ScMemberCardTypesController { @Autowired private ScMemberCardTypesService typesService; - @Autowired - private IScCourseTypeService courseTypeService; - @Autowired private ScMemberCardChargeService cardChargeService; @Autowired private ScMemberCardCourseService cardCoursesService; - @Autowired - private ISysUserService userService; - @Autowired private IScMemberCardService memberCardService; @@ -84,32 +73,10 @@ public class ScMemberCardTypesController { qw.last(ObjectUtil.isNotEmpty(types.getCourseTypeId())," and JSON_CONTAINS(course_types, CAST("+types.getCourseTypeId()+" AS JSON)) "); RespPage respPage = new RespPage<>(types.getPageNum(),types.getPageSize()); RespPage listPage =typesService.page(respPage, qw); + listPage.getRows().forEach(l->{ //获取课程分类 名 - if (ObjectUtil.isNotEmpty(l.getCourseTypes())||l.getCourseTypes().length>0){ - List courseTypeIds = Arrays.asList(l.getCourseTypes()); - List courseTypeList=courseTypeService.listByIds(courseTypeIds); - String typesName= courseTypeList.stream().map(ScCourseType::getCourseType) - .collect(Collectors.joining(",")); - l.setCourseTypesName(typesName); - } - //付费模式 default customize自定义 - if (l.getChargeType().equals("customize")){ - List list=cardChargeService.getByMemberId(l.getCardTypeId()); - l.setFeeModeHourList(list); - } - //限制教师 - if (l.getRestrictedTeacher().equals("2") ){ - List users= userService.selectUserByIds(l.getTeacherList()); - String userNames= users.stream().map(SysUser::getNickName).collect(Collectors.joining(",")); - l.setTeachersName(userNames); - } - //限制课程 - if (l.getRestrictedCourses().equals("2")){ - //课程类别名称 课程名称 - List cardCoursesList=cardCoursesService.getByCardId(l.getCardTypeId()); - l.setCourses(cardCoursesList); - } + typesService.memberTypeDetail(l); }); return APIResponse.toAPIResponse(listPage); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java deleted file mode 100644 index 2f7736b..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; - -/** - * 岗位信息操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/post") -public class SysPostController extends BaseController -{ - @Autowired - private ISysPostService postService; - - /** - * 获取岗位列表 - */ - @PreAuthorize("@ss.hasPermi('system:post:list')") - @GetMapping("/list") - public TableDataInfo list(SysPost post) - { - startPage(); - List list = postService.selectPostList(post); - return getDataTable(list); - } - - @Log(title = "岗位管理", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:post:export')") - @GetMapping("/export") - public AjaxResult export(SysPost post) - { - List list = postService.selectPostList(post); - ExcelUtil util = new ExcelUtil(SysPost.class); - return util.exportExcel(list, "岗位数据"); - } - - /** - * 根据岗位编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:post:query')") - @GetMapping(value = "/{postId}") - public AjaxResult getInfo(@PathVariable Long postId) - { - return AjaxResult.success(postService.selectPostById(postId)); - } - - /** - * 新增岗位 - */ - @PreAuthorize("@ss.hasPermi('system:post:add')") - @Log(title = "岗位管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { - return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { - return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); - } - post.setCreateBy(getUserId()); - return toAjax(postService.insertPost(post)); - } - - /** - * 修改岗位 - */ - @PreAuthorize("@ss.hasPermi('system:post:edit')") - @Log(title = "岗位管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { - return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { - return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); - } - post.setUpdateBy(getUserId()); - return toAjax(postService.updatePost(post)); - } - - /** - * 删除岗位 - */ - @PreAuthorize("@ss.hasPermi('system:post:remove')") - @Log(title = "岗位管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{postIds}") - public AjaxResult remove(@PathVariable Long[] postIds) - { - return toAjax(postService.deletePostByIds(postIds)); - } - - /** - * 获取岗位选择框列表 - */ - @GetMapping("/optionselect") - public AjaxResult optionselect() - { - List posts = postService.selectPostAll(); - return AjaxResult.success(posts); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 2dd216c..3a48f61 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -39,7 +39,6 @@ public class SysProfileController extends BaseController SysUser user = loginUser.getUser(); AjaxResult ajax = AjaxResult.success(user); ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); - ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); return ajax; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 6098e61..5eb36ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; import org.apache.commons.lang3.ArrayUtils; @@ -40,8 +39,6 @@ public class SysUserController extends BaseController @Autowired private ISysRoleService roleService; - @Autowired - private ISysPostService postService; /** * 获取用户列表 @@ -107,7 +104,6 @@ public class SysUserController extends BaseController AjaxResult ajax = AjaxResult.success(); List roles = roleService.selectRoleAll(); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - ajax.put("posts", postService.selectPostAll()); if (StringUtils.isNotNull(userId)) { List roleIds=roleService.selectRoleListByUserId(userId) ; @@ -116,7 +112,6 @@ public class SysUserController extends BaseController roleIds1.add(l.toString()); }); ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId)); - ajax.put("postIds", postService.selectPostListByUserId(userId)); ajax.put("roleIds",roleIds1 ); } return ajax; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 1a79893..767ac84 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -63,6 +63,7 @@ public class SysDept extends BaseEntity // private String tenantId; + //1部门 2校区 private String deptType; /** 子部门 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java index 908c648..b2b3593 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java @@ -13,6 +13,8 @@ public class ClaTimeCalendarItem { private String courseTimeId; + private String claId; + private String claName; private String courseName; @@ -44,6 +46,7 @@ public class ClaTimeCalendarItem { this.claName = respClaTime.getClaName(); this.courseName = respClaTime.getCourseName(); this.claDate = respClaTime.getClaDate(); + this.claId = respClaTime.getClaId(); this.weekDay = SysConstant.WEEK_DAY_MAP.get(respClaTime.getWeekDay()); this.startTime = respClaTime.getStartTime().substring(0,5); this.endTime = respClaTime.getEndTime().substring(0,5); diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTime.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTime.java index 0ab0232..20c8b16 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTime.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTime.java @@ -50,9 +50,18 @@ public class RespClaTime { // 实到 private Integer realAttendCnt; - private Integer leaveCnt; + /** + * 最多预约人数 + */ + private Integer atClassCnt; + + /** + * 最少开课人数 + */ + + private Integer lessCnt; + - private Integer outCnt; private BigDecimal payHour; diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java index 343ea0d..3825688 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java @@ -73,6 +73,7 @@ public interface ScClaTimeAttendMapper extends com.baomidou.mybatisplus.core.map BigDecimal selectAttendCostHour(@Param("beginDate") String beginDate , @Param("endDate") String endDate , @Param("tenantId") String tenantId); + BigDecimal selectMemberByDay( @Param("tenantId") String tenantId); /** * 应消 学生消耗课时数量 diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java index 32fb033..1309227 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.common.utils.SecurityUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.List; /** @@ -43,7 +44,9 @@ public class ScClaTimeAttendServiceImpl extends ServiceImpl implements IScCourseTypeService { + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/service/DashboardService.java b/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/service/DashboardService.java index 052d988..ff9a3f7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/service/DashboardService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/service/DashboardService.java @@ -5,9 +5,16 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.school.course.domain.ScCourse; +import com.ruoyi.school.course.domain.ScCourseCla; +import com.ruoyi.school.course.domain.req.time.ReqClaTimeCount; +import com.ruoyi.school.course.enums.ClaTimeAttendStatusEnums; +import com.ruoyi.school.course.service.IScClaTimeAttendService; +import com.ruoyi.school.course.service.IScClaTimeService; +import com.ruoyi.school.course.service.IScCourseClaService; import com.ruoyi.school.course.service.IScCourseService; import com.ruoyi.school.dashboard.domain.resp.DashboardData; import com.ruoyi.school.member.domain.ScStudent; +import com.ruoyi.school.member.mapper.ScMemberCardMapper; import com.ruoyi.school.member.service.IScMemberCardService; import com.ruoyi.school.order.enums.OrderTypeEnum; import com.ruoyi.school.order.service.IScOrderService; @@ -16,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; + /** * @author ：zhangbaoyu * @date ：Created in 2020/10/18 15:34 @@ -32,6 +41,18 @@ public class DashboardService { private IScStudentService studentService; @Autowired private IScOrderService orderService; + + @Autowired + private IScCourseClaService claService; + + @Autowired + private IScClaTimeService claTimeService; + + @Autowired + private IScClaTimeAttendService attendService; + + @Autowired + private ScMemberCardMapper memberCardMapper; // /** @@ -44,42 +65,42 @@ public class DashboardService { String thisMonthBegin = DateUtil.beginOfMonth(DateTime.now()).toString("yyyy-MM-dd"); String thisMonthEnd = DateUtil.endOfMonth(DateTime.now()).toString("yyyy-MM-dd"); String tenantId=SecurityUtils.getLoginUser().getNowTenantId(); -// int claCnt = claService.count(new QueryWrapper().eq("tenant_id",tenantId)); + int claCnt = claService.count(new QueryWrapper().eq("tenant_id",tenantId)); int courseCnt = courseService.count(new QueryWrapper().eq("tenant_id",tenantId)); int studentCnt = studentService.count(new QueryWrapper().eq("tenant_id",tenantId)); -// ReqClaTimeCount reqClaTimeCount = ReqClaTimeCount.builder().beginDate(todayDate).endDate(todayDate).hadBegin(null).tenantId(tenantId).build(); -// Integer todayClaTimeCnt = claTimeService.claTimeCount(reqClaTimeCount); + ReqClaTimeCount reqClaTimeCount = ReqClaTimeCount.builder().beginDate(todayDate).endDate(todayDate).hadBegin(null).tenantId(tenantId).build(); + Integer todayClaTimeCnt = claTimeService.claTimeCount(reqClaTimeCount); -// reqClaTimeCount.setHadBegin(true); -// Integer completeTodayClaTimeCnt = claTimeService.claTimeCount(reqClaTimeCount); + reqClaTimeCount.setHadBegin(true); + Integer completeTodayClaTimeCnt = claTimeService.claTimeCount(reqClaTimeCount); Integer todayOrderCnt = orderService.orderCount(todayDate, todayDate, OrderTypeEnum.SIGN_UP.getOrderType()); Integer thisMonthOrderCnt = orderService.orderCount(thisMonthBegin, thisMonthEnd, OrderTypeEnum.SIGN_UP.getOrderType()); -// Integer todayNeedAttendCnt = attendService.getNeedAttendCount(todayDate, todayDate); -// Integer todayRealAttendCnt = attendService.getAttendCount(todayDate, todayDate, -// new String[]{ClaTimeAttendStatusEnums.AT_CLASS.getAttendStatus()}); + Integer todayNeedAttendCnt = attendService.getNeedAttendCount(todayDate, todayDate); + Integer todayRealAttendCnt = attendService.getAttendCount(todayDate, todayDate, + new String[]{ClaTimeAttendStatusEnums.AT_CLASS.getAttendStatus()}); // BigDecimal todayNeedCostHour = attendService.getAttendCostHour(todayDate, todayDate, true); -// BigDecimal todayRealCostHour = attendService.getAttendCostHour(todayDate, todayDate, false); -// Integer feeWillExpireCnt = orderService.arrearsStudentCount(); -// Integer dateWillExpireCnt = studentCourseService.getWillExpireDateCount(10); -// Integer hourWillExpireCnt = studentCourseService.getWillExpireHourCount(5); + BigDecimal todayRealCostHour = attendService.getAttendCostHour(todayDate, todayDate, false); + Integer feeWillExpireCnt = memberCardMapper.selectFeeWillExpireCards(200); + Integer dateWillExpireCnt = memberCardMapper.selectExpiringCards(5).size(); + Integer hourWillExpireCnt = memberCardMapper.selectHourWillExpireCards(10); return DashboardData.builder() -// .todayClaTimeCnt(todayClaTimeCnt) -// .completeTodayClaTimeCnt(completeTodayClaTimeCnt) + .todayClaTimeCnt(todayClaTimeCnt) + .completeTodayClaTimeCnt(completeTodayClaTimeCnt) .todayOrderCnt(todayOrderCnt) .thisMonthOrderCnt(thisMonthOrderCnt) -// .todayRealAttendCnt(todayRealAttendCnt) -// .todayNeedAttendCnt(todayNeedAttendCnt) + .todayRealAttendCnt(todayRealAttendCnt) + .todayNeedAttendCnt(todayNeedAttendCnt) // .todayNeedCostHour(todayNeedCostHour) -// .todayRealCostHour(todayRealCostHour) + .todayRealCostHour(todayRealCostHour) .studentCnt(studentCnt) -// .claCnt(claCnt) + .claCnt(claCnt) .courseCnt(courseCnt) -// .feeWillExpireCnt(arrearsStudentCnt) -// .dateWillExpireCnt(dateWillExpireCnt) -// .hourWillExpireCnt(hourWillExpireCnt) + .feeWillExpireCnt(feeWillExpireCnt) + .dateWillExpireCnt(dateWillExpireCnt) + .hourWillExpireCnt(hourWillExpireCnt) .build(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java index b5a3a85..268962c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java @@ -67,6 +67,10 @@ public class ScMemberCard implements Serializable { */ @TableField("remaining_count") private BigDecimal remainingCount; + @TableField("count_fee") + private BigDecimal countFee; + @TableField("day_fee") + private BigDecimal dayFee; /** * 剩余天数 diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java index 6d69cb6..55462c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java @@ -24,6 +24,7 @@ public class MemberCardDTO { //"卡类型ID") private Long cardTypeId; + //"卡类型名称") private String cardTypeName; diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardVO.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardVO.java index f150cf2..602cb9c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardVO.java @@ -1,5 +1,6 @@ package com.ruoyi.school.member.domain.resp; +import com.ruoyi.school.member.domain.ScMemberCardTypes; import lombok.Data; import java.time.LocalDate; @@ -29,7 +30,7 @@ public class MemberCardVO extends MemberCardDTO { //"剩余有效期（天）") private Long remainingValidDays; - + private ScMemberCardTypes cardTypes;// diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScMemberCardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScMemberCardMapper.java index 180f5cb..642471c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScMemberCardMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScMemberCardMapper.java @@ -43,6 +43,11 @@ public interface ScMemberCardMapper extends BaseMapper { @Select("SELECT * FROM sc_member_cards WHERE expiry_date BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL #{days} DAY) AND status = 'ACTIVE' AND is_deleted = 0") List selectExpiringCards(@Param("days") Integer days); + @Select("SELECT count(1) FROM sc_member_cards WHERE remaining_total_fee <= #{fee} AND status = 'ACTIVE' AND is_deleted = 0") + Integer selectFeeWillExpireCards(@Param("fee") Integer fee); + @Select("SELECT count(1) FROM sc_member_cards WHERE remaining_count <= #{hour} AND status = 'ACTIVE' AND is_deleted = 0") + Integer selectHourWillExpireCards(@Param("hour") Integer hour); + /** * 更新会员卡状态 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/ScMemberCardTypesService.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/ScMemberCardTypesService.java index 91fdd33..accef85 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/ScMemberCardTypesService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/ScMemberCardTypesService.java @@ -10,5 +10,5 @@ public interface ScMemberCardTypesService extends IService { APIResponse orderCardTypeDetail(ReqBusinessOrderCourseDetail orderCourseDetail); - + void memberTypeDetail(ScMemberCardTypes l); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java index 459e695..9d00629 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java @@ -28,6 +28,8 @@ import com.ruoyi.school.member.mapper.ScMemberCardMapper; import com.ruoyi.school.member.mapper.ScMemberCardTypesMapper; import com.ruoyi.school.member.mapper.ScStudentMapper; import com.ruoyi.school.member.service.IScMemberCardService; +import com.ruoyi.school.member.service.ScMemberCardCourseService; +import com.ruoyi.school.member.service.ScMemberCardTypesService; import com.ruoyi.school.order.domain.ScOrder; import com.ruoyi.school.order.service.IScOrderService; import com.ruoyi.school.salary.domain.ScCommissionPlans; @@ -45,6 +47,7 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; @@ -68,6 +71,8 @@ public class ScMemberCardServiceImpl extends ServiceImpl() .eq("card_no",bookCourse.getCardNo()) - .eq("charge_type",bookCourse.getChargeType()) .eq("is_deleted",0) .last(" and expiry_date > CURDATE() ") - ); if (ObjectUtil.isEmpty(memberCard)){ return APIResponse.toExceptionResponse(bookCourse.getCardNo()+"会员卡状态异常，请与教练核实!"); } - String chargeType=memberCard.getChargeType(); + //预约时的扣费类型 + String chargeType=bookCourse.getChargeType(); // 上课记出勤表 ScClaTimeAttend addClaTimeAttend = new ScClaTimeAttend(); + if (chargeType.equals("count")){ if (memberCard.getRemainingCount().compareTo(bookCourse.getDeductCnt())>-1){ addClaTimeAttend.setPayHour(bookCourse.getDeductCnt()); addClaTimeAttend.setCountBefore(memberCard.getRemainingCount()); - + addClaTimeAttend.setPayFee(memberCard.getPrice().divide(memberCard.getTotalCount(),2, RoundingMode.HALF_UP)); BigDecimal countAfter= memberCard.getRemainingCount().subtract(bookCourse.getDeductCnt()); addClaTimeAttend.setCountAfter(countAfter); memberCard.setRemainingCount(countAfter); @@ -574,18 +584,6 @@ public class ScMemberCardServiceImpl extends ServiceImpl voList = listPage.getRows().stream() .map(this::convertToVO) .collect(Collectors.toList()); + + voList.forEach(l->{ + //课程类别名称 课程名称 + ScMemberCardTypes types=cardTypesService.getById(l.getCardTypeId()); + cardTypesService.memberTypeDetail(types); + l.setCardTypes(types); + }); // 构建返回结果 RespPage result = new RespPage<>(queryDTO.getPageNum(), queryDTO.getPageSize()); result.setRows(voList); diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java index 50ae845..695f67d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java @@ -1,18 +1,29 @@ package com.ruoyi.school.member.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.core.api.APIResponse; +import com.ruoyi.school.course.domain.ScCourseType; import com.ruoyi.school.course.domain.req.course.ReqBusinessOrderCourseDetail; import com.ruoyi.school.course.domain.resp.course.RespBusinessChooseCourseInfo; +import com.ruoyi.school.course.service.IScCourseTypeService; +import com.ruoyi.school.member.domain.ScMemberCardCourses; import com.ruoyi.school.member.domain.ScMemberCardTypes; +import com.ruoyi.school.member.domain.req.ReqAddMemberChargeItem; import com.ruoyi.school.member.domain.resp.MemberCardVO; import com.ruoyi.school.member.mapper.ScMemberCardTypesMapper; import com.ruoyi.school.member.service.IScMemberCardService; +import com.ruoyi.school.member.service.ScMemberCardChargeService; +import com.ruoyi.school.member.service.ScMemberCardCourseService; import com.ruoyi.school.member.service.ScMemberCardTypesService; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -25,8 +36,44 @@ public class ScMemberCardTypesServiceImpl extends ServiceImpl0){ + List courseTypeIds = Arrays.asList(l.getCourseTypes()); + List courseTypeList=courseTypeService.listByIds(courseTypeIds); + String typesName= courseTypeList.stream().map(ScCourseType::getCourseType) + .collect(Collectors.joining(",")); + l.setCourseTypesName(typesName); + } + //付费模式 default customize自定义 + if (l.getChargeType().equals("customize")){ + List list=cardChargeService.getByMemberId(l.getCardTypeId()); + l.setFeeModeHourList(list); + } + //限制教师 + if (l.getRestrictedTeacher().equals("2") ){ + List users= userService.selectUserByIds(l.getTeacherList()); + String userNames= users.stream().map(SysUser::getNickName).collect(Collectors.joining(",")); + l.setTeachersName(userNames); + } + //限制课程 + if (l.getRestrictedCourses().equals("2")){ + //课程类别名称 课程名称 + List cardCoursesList=cardCoursesService.getByCardId(l.getCardTypeId()); + l.setCourses(cardCoursesList); + } + + } @Override public APIResponse orderCardTypeDetail(ReqBusinessOrderCourseDetail orderCourseDetail){ Long cardTypeId = orderCourseDetail.getCardTypeId(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java deleted file mode 100644 index a3fe7fe..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.ruoyi.system.domain; - -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -/** - * 岗位表 sys_post - * - * @author ruoyi - */ -public class SysPost extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 岗位序号 */ - @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) - private Long postId; - - /** 岗位编码 */ - @Excel(name = "岗位编码") - private String postCode; - - /** 岗位名称 */ - @Excel(name = "岗位名称") - private String postName; - - /** 岗位排序 */ - @Excel(name = "岗位排序") - private String postSort; - - /** 状态（0正常 1停用） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=停用") - private String status; - private String tenantId; - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - /** 用户是否存在此岗位标识 默认不存在 */ - private boolean flag = false; - - public Long getPostId() - { - return postId; - } - - public void setPostId(Long postId) - { - this.postId = postId; - } - - @NotBlank(message = "岗位编码不能为空") - @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") - public String getPostCode() - { - return postCode; - } - - public void setPostCode(String postCode) - { - this.postCode = postCode; - } - - @NotBlank(message = "岗位名称不能为空") - @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") - public String getPostName() - { - return postName; - } - - public void setPostName(String postName) - { - this.postName = postName; - } - - @NotBlank(message = "显示顺序不能为空") - public String getPostSort() - { - return postSort; - } - - public void setPostSort(String postSort) - { - this.postSort = postSort; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public boolean isFlag() - { - return flag; - } - - public void setFlag(boolean flag) - { - this.flag = flag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("postId", getPostId()) - .append("postCode", getPostCode()) - .append("postName", getPostName()) - .append("postSort", getPostSort()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java deleted file mode 100644 index a428919..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.system.domain.SysPost; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 岗位信息 数据层 - * - * @author ruoyi - */ -public interface SysPostMapper -{ - /** - * 查询岗位数据集合 - * - * @param post 岗位信息 - * @return 岗位数据集合 - */ - public List selectPostList(SysPost post); - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll(String tenantId); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - public SysPost selectPostById(Long postId); - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - public List selectPostListByUserId(@Param("userId") Long userId,@Param("tenantId") String tenantId); - - /** - * 查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - public List selectPostsByUserName(String userName); - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - public int deletePostById(Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - */ - public int deletePostByIds(Long[] postIds); - - /** - * 修改岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int updatePost(SysPost post); - - /** - * 新增岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int insertPost(SysPost post); - - /** - * 校验岗位名称 - * - * @param postName 岗位名称 - * @return 结果 - */ - public SysPost checkPostNameUnique(String postName); - - /** - * 校验岗位编码 - * - * @param postCode 岗位编码 - * @return 结果 - */ - public SysPost checkPostCodeUnique(String postCode); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java deleted file mode 100644 index aab216d..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.SysPost; - -/** - * 岗位信息 服务层 - * - * @author ruoyi - */ -public interface ISysPostService -{ - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * @return 岗位列表 - */ - public List selectPostList(SysPost post); - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll(); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - public SysPost selectPostById(Long postId); - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - public List selectPostListByUserId(Long userId); - - /** - * 校验岗位名称 - * - * @param post 岗位信息 - * @return 结果 - */ - public String checkPostNameUnique(SysPost post); - - /** - * 校验岗位编码 - * - * @param post 岗位信息 - * @return 结果 - */ - public String checkPostCodeUnique(SysPost post); - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - public int countUserPostById(Long postId); - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - public int deletePostById(Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - * @throws Exception 异常 - */ - public int deletePostByIds(Long[] postIds); - - /** - * 新增保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int insertPost(SysPost post); - - /** - * 修改保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int updatePost(SysPost post); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 33e4a82..160c030 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -45,13 +45,6 @@ public interface ISysUserService */ public String selectUserRoleGroup(String userName); - /** - * 根据用户ID查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - public String selectUserPostGroup(String userName); /** * 校验用户名称是否唯一 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java deleted file mode 100644 index ef63fbe..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.ruoyi.system.service.impl; - -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 岗位信息 服务层处理 - * - * @author ruoyi - */ -@Service -public class SysPostServiceImpl implements ISysPostService -{ - @Autowired - private SysPostMapper postMapper; - - @Autowired - private SysUserPostMapper userPostMapper; - - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * @return 岗位信息集合 - */ - @Override - public List selectPostList(SysPost post) - { - post.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); - return postMapper.selectPostList(post); - } - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - @Override - public List selectPostAll() - { - return postMapper.selectPostAll(SecurityUtils.getLoginUser().getNowTenantId()); - } - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - @Override - public SysPost selectPostById(Long postId) - { - return postMapper.selectPostById(postId); - } - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - @Override - public List selectPostListByUserId(Long userId) - { - - return postMapper.selectPostListByUserId(userId,SecurityUtils.getLoginUser().getNowTenantId()); - } - - /** - * 校验岗位名称是否唯一 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public String checkPostNameUnique(SysPost post) - { - Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostNameUnique(post.getPostName()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验岗位编码是否唯一 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public String checkPostCodeUnique(SysPost post) - { - Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - @Override - public int countUserPostById(Long postId) - { - return userPostMapper.countUserPostById(postId); - } - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - @Override - public int deletePostById(Long postId) - { - return postMapper.deletePostById(postId); - } - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - * @throws Exception 异常 - */ - @Override - public int deletePostByIds(Long[] postIds) - { - for (Long postId : postIds) - { - SysPost post = selectPostById(postId); - if (countUserPostById(postId) > 0) - { - throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); - } - } - return postMapper.deletePostByIds(postIds); - } - - /** - * 新增保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public int insertPost(SysPost post) - { - post.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); - return postMapper.insertPost(post); - } - - /** - * 修改保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public int updatePost(SysPost post) - { - return postMapper.updatePost(post); - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 795449e..93eecb8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -52,7 +52,7 @@ public class SysRoleServiceImpl implements ISysRoleService @DataScope(deptAlias = "d") public List selectRoleList(SysRole role) { - role.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); +// role.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); return roleMapper.selectRoleList(role); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index 789aa54..3cc9e22 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -147,8 +147,7 @@ public class SysTenantServiceImpl extends ServiceImpl list = postMapper.selectPostsByUserName(userName); - StringBuffer idsStr = new StringBuffer(); - for (SysPost post : list) - { - idsStr.append(post.getPostName()).append(","); - } - if (StringUtils.isNotEmpty(idsStr.toString())) - { - return idsStr.substring(0, idsStr.length() - 1); - } - return idsStr.toString(); - } + /** * 校验用户名称是否唯一 @@ -248,8 +225,6 @@ public class SysUserServiceImpl implements ISysUserService { // 新增用户信息 int rows = userMapper.insertUser(user); - // 新增用户岗位关联 - insertUserPost(user); // 新增用户与角色管理 insertUserRole(user); //新增app用户 @@ -316,10 +291,6 @@ public class SysUserServiceImpl implements ISysUserService userRoleMapper.deleteUserRoleByUserId(userId); // 新增用户与角色管理 insertUserRole(user); - // 删除用户与岗位关联 - userPostMapper.deleteUserPostByUserId(userId); - // 新增用户与岗位管理 - insertUserPost(user); //如果账号停用【帐号状态（0正常 1停用）】取消与app登录用户的关联 if (user.getStatus().equals("1")){ removeAppUserManager(userId); @@ -432,31 +403,7 @@ public class SysUserServiceImpl implements ISysUserService } } - /** - * 新增用户岗位信息 - * - * @param user 用户对象 - */ - public void insertUserPost(SysUser user) - { - Long[] posts = user.getPostIds(); - if (StringUtils.isNotNull(posts)) - { - // 新增用户与岗位管理 - List list = new ArrayList(); - for (Long postId : posts) - { - SysUserPost up = new SysUserPost(); - up.setUserId(user.getUserId()); - up.setPostId(postId); - list.add(up); - } - if (list.size() > 0) - { - userPostMapper.batchUserPost(list); - } - } - } + /** * 新增用户角色信息 @@ -513,8 +460,6 @@ public class SysUserServiceImpl implements ISysUserService } // 删除用户与角色关联 userRoleMapper.deleteUserRole(userIds); - // 删除用户与岗位关联 - userPostMapper.deleteUserPost(userIds); return userMapper.deleteUserByIds(userIds); } diff --git a/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml b/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml index 6ca6437..102394a 100644 --- a/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml index aaeaeaf..b7ab702 100644 --- a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml @@ -44,37 +44,36 @@ and exists(select 1 from sc_cla_time b where a.course_time_id=b.course_time_id and b.real_cla_date between #{beginDate} and #{endDate} ) + @@ -72,7 +72,7 @@ left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_user_role ur on rm.role_id = ur.role_id left join sys_role ro on ur.role_id = ro.role_id - left join sys_user u on ur.user_id = u.user_id and u.tenant_id=rm.tenant_id + left join sys_user u on ur.user_id = u.user_id where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0 order by m.parent_id, m.order_num @@ -81,7 +81,8 @@ select m.menu_id from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id - where rm.role_id = #{roleId} and rm.tenant_id=#{tenantId} + where rm.role_id = #{roleId} + and rm.tenant_id='1' and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId}) @@ -102,7 +103,10 @@ left join sys_user_role ur on rm.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id - where m.status = '0' and r.status = '0' and ur.user_id = #{userId} and rm.tenant_id=#{tenantId} + where m.status = '0' + and r.status = '0' + and ur.user_id = #{userId} + and rm.tenant_id='1' - - - tenant_id = #{tenantId} - - AND post_code like concat('%', #{postCode}, '%') - - - AND status = #{status} - - - AND post_name like concat('%', #{postName}, '%') - - - - - - - - - - - - - - - - - - update sys_post - - post_code = #{postCode}, - post_name = #{postName}, - post_sort = #{postSort}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where post_id = #{postId} - - - - insert into sys_post( - post_id, - post_code, - post_name, - post_sort, - status, - remark, - create_by, - tenant_id, - create_time - )values( - #{postId}, - #{postCode}, - #{postName}, - #{postSort}, - #{status}, - #{remark}, - #{createBy}, - #{tenantId}, - sysdate() - ) - - - - delete from sys_post where post_id = #{postId} - - - - delete from sys_post where post_id in - - #{postId} - - - - diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 14c1778..6622b77 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -71,9 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id - where u.user_id = #{userId} and r.tenant_id in (#{tenantId},"1") + where u.user_id = #{userId} -