diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScCourseTypeController.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScCourseTypeController.java index c360953..a3bd231 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScCourseTypeController.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/controller/ScCourseTypeController.java @@ -4,6 +4,8 @@ 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.*; @@ -62,6 +64,8 @@ public class ScCourseTypeController { */ @PostMapping("/add/addScCourseType") public APIResponse addScCourseType(@RequestBody ScCourseType scCourseType) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + scCourseType.setTenantId(loginUser.getNowTenantId()); return scCourseTypeService.addScCourseType(scCourseType); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/course/ReqAddScCourse.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/course/ReqAddScCourse.java index 49b1a41..9b6c83b 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/course/ReqAddScCourse.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/course/ReqAddScCourse.java @@ -82,10 +82,10 @@ public class ReqAddScCourse { if (StringUtils.isEmpty(courseCampus)) { return APIBaseResponse.fail("请选择上课校区"); } - if ("part".equals(courseCampus) && null == partCampus) { + if ("部分校区".equals(courseCampus) && null == partCampus) { return APIBaseResponse.fail("请选择上课校区"); } - if ("part".equals(courseCampus) && partCampus.length == 0) { + if ("部分校区".equals(courseCampus) && partCampus.length == 0) { return APIBaseResponse.fail("请选择上课校区"); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/course/RespSearchCourse.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/course/RespSearchCourse.java index 8614127..19f0633 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/course/RespSearchCourse.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/course/RespSearchCourse.java @@ -12,11 +12,11 @@ import java.util.Date; @Data public class RespSearchCourse implements Serializable { - private Long courseId; + private String courseId; private String courseName; - private Long courseTypeId; + private String courseTypeId; /** * 课程类型 diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseService.java index 5deb5e0..3398744 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseService.java @@ -138,16 +138,16 @@ public class BusinessScCourseService { respScCourseDetail.setCourseTypeId(detailInfo.getCourseTypeId()); respScCourseDetail.setTeachingMode(detailInfo.getTeachingMode()); respScCourseDetail.setCourseIntro(detailInfo.getCourseIntro()); - respScCourseDetail.setCourseCampus("part"); + respScCourseDetail.setCourseCampus("部分校区"); respScCourseDetail.setPartCampus(new String[]{}); if(null != detailInfo.getCourseTypeId()) { ScCourseType courseType = courseTypeService.getById(detailInfo.getCourseTypeId()); - respScCourseDetail.setCourseTypeName(courseType.getCourseType()); + Optional.ofNullable(courseType).ifPresent(item->{ + respScCourseDetail.setCourseTypeName(item.getCourseType()); + }); } - - List feeModeHourList = Lists.newArrayList(); List feeModeDateList = Lists.newArrayList(); List feeModeCycleList = Lists.newArrayList(); @@ -176,7 +176,7 @@ public class BusinessScCourseService { String chargeType = courseCharge.getChargeType(); chargeItem.setChargeId(courseCharge.getChargeId()); chargeItem.setCampusId(courseCharge.getDepartId()); - chargeItem.setCampusName(campusMap.get(courseCharge.getDepartId().toString())); + chargeItem.setCampusName(campusMap.get(courseCharge.getDepartId())); if ("hour".equals(chargeType)) { chargeItem.setCnt(courseCharge.getCount()); chargeItem.setTotalFee(courseCharge.getTotalFee()); @@ -195,9 +195,9 @@ public class BusinessScCourseService { // 上课校区 所有或部分校区 if (partCampusList.size() == 0) { - respScCourseDetail.setCourseCampus("all"); + respScCourseDetail.setCourseCampus("全部校区"); } else { - respScCourseDetail.setCourseCampus("part"); + respScCourseDetail.setCourseCampus("部分校区"); respScCourseDetail.setPartCampus(partCampusList.toArray(new String[partCampusList.size()])); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java index 2c77357..403e092 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java @@ -6,7 +6,10 @@ import cn.xluobo.business.sc.salary.repo.model.ScCommissionPlans; import cn.xluobo.business.sc.salary.service.ScCommissionPlansService; import cn.xluobo.core.page.RespPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.cyl.h5.config.SecurityUtil; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.SecurityUtils; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -35,6 +38,8 @@ public class ScCommissionPlansController { @PostMapping("saveOrEdit") public AjaxResult saveOrEdit(@RequestBody ScCommissionPlans salaryBase){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + salaryBase.setTenantId(loginUser.getNowTenantId()); service.saveOrUpdate(salaryBase); return AjaxResult.success(); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/ScCommissionPlans.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/ScCommissionPlans.java index 6df78b6..0c42abf 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/ScCommissionPlans.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/ScCommissionPlans.java @@ -1,8 +1,10 @@ package cn.xluobo.business.sc.salary.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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.Setter; @@ -39,6 +41,11 @@ public class ScCommissionPlans { private Byte isActive; + @TableField(exist = false) + private String tenantId; + + + @JsonFormat(pattern = "yyyy-MM-dd") private Date effectiveDate; private Date createdAt; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java index b9fd89a..d5d70e2 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java @@ -26,6 +26,7 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Optional; /** * @author ：zhangbaoyu @@ -95,7 +96,8 @@ public class BusinessScStudentService { // 学校名称 if (null != detailInfo.getSchoolId()) { ScSchool scSchool = schoolService.getById(detailInfo.getSchoolId()); - detailInfo.setSchoolName(scSchool.getSchoolName()); + Optional.ofNullable(scSchool) + .ifPresent(item-> detailInfo.setSchoolName(item.getSchoolName())); } return APIResponse.toAPIResponse(detailInfo); diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/resp/RespTreeSelect.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/resp/RespTreeSelect.java index 56a2912..26f58f7 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/resp/RespTreeSelect.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/resp/RespTreeSelect.java @@ -33,6 +33,7 @@ public class RespTreeSelect { } public RespTreeSelect(SysDept dept){ - + this.id=dept.getDeptId(); + this.label=dept.getDeptName(); } } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java index 9790644..e61d75e 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java @@ -178,11 +178,11 @@ public class BusinessSysDeptService { // sysDept.setInUse("1"); // sysDept.setDeleteFlag("0"); // sysDept.setDeptType("2"); - QueryWrapper qw = new QueryWrapper(sysDept); - qw.orderByAsc("sort"); + LoginUser loginUser = SecurityUtils.getLoginUser(); + sysDept.setTenantId(loginUser.getNowTenantId()); + QueryWrapper qw = new QueryWrapper<>(sysDept); List list = sysDeptService.list(qw); - List respTreeSelects = list.stream().map(RespTreeSelect::new).collect(Collectors.toList()); - return respTreeSelects; + return list.stream().map(RespTreeSelect::new).collect(Collectors.toList()); } /**