mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂时还原量表套餐详情

This commit is contained in:
cjw 2024-10-24 10:36:02 +08:00
parent 4b5abd7786
commit 6b3b153886
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java
View File

@ -16,7 +16,6 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScalePackageBo; import org.dromara.scale.domain.bo.SysScalePackageBo;
import org.dromara.scale.domain.vo.SysScalePackageDetailVo;
import org.dromara.scale.domain.vo.SysScalePackageVo; import org.dromara.scale.domain.vo.SysScalePackageVo;
import org.dromara.scale.service.ISysScalePackageService; import org.dromara.scale.service.ISysScalePackageService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -66,7 +65,7 @@ public class SysScalePackageController extends BaseController {
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:scalePackage:query") @SaCheckPermission("system:scalePackage:query")
@GetMapping("/{packageId}") @GetMapping("/{packageId}")
public R<SysScalePackageDetailVo> getInfo(@NotNull(message = "主键不能为空") public R<SysScalePackageVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long packageId) { @PathVariable Long packageId) {
return R.ok(sysScalePackageService.queryById(packageId)); return R.ok(sysScalePackageService.queryById(packageId));
} }

3
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java
View File

@ -3,7 +3,6 @@ package org.dromara.scale.service;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.scale.domain.bo.SysScalePackageBo; import org.dromara.scale.domain.bo.SysScalePackageBo;
import org.dromara.scale.domain.vo.SysScalePackageDetailVo;
import org.dromara.scale.domain.vo.SysScalePackageVo; import org.dromara.scale.domain.vo.SysScalePackageVo;
import java.util.Collection; import java.util.Collection;
@ -23,7 +22,7 @@ public interface ISysScalePackageService {
* @param packageId 主键 * @param packageId 主键
* @return 量表套餐 * @return 量表套餐
*/ */
SysScalePackageDetailVo queryById(Long packageId); SysScalePackageVo queryById(Long packageId);
/** /**
* 分页查询量表套餐列表 * 分页查询量表套餐列表

23
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java
View File

@ -1,7 +1,6 @@
package org.dromara.scale.service.impl; package org.dromara.scale.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -12,10 +11,8 @@ import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.scale.domain.SysScale;
import org.dromara.scale.domain.SysScalePackage; import org.dromara.scale.domain.SysScalePackage;
import org.dromara.scale.domain.bo.SysScalePackageBo; import org.dromara.scale.domain.bo.SysScalePackageBo;
import org.dromara.scale.domain.vo.SysScalePackageDetailVo;
import org.dromara.scale.domain.vo.SysScalePackageVo; import org.dromara.scale.domain.vo.SysScalePackageVo;
import org.dromara.scale.mapper.SysScaleMapper; import org.dromara.scale.mapper.SysScaleMapper;
import org.dromara.scale.mapper.SysScalePackageMapper; import org.dromara.scale.mapper.SysScalePackageMapper;
@ -49,16 +46,16 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService {
* @return 量表套餐 * @return 量表套餐
*/ */
@Override @Override
public SysScalePackageDetailVo queryById(Long packageId) { public SysScalePackageVo queryById(Long packageId) {
// SysScalePackage scalePackage = baseMapper.selectById(packageId);
SysScalePackage scalePackage = baseMapper.selectById(packageId); // SysScalePackageDetailVo detailVo = MapstructUtils.convert(scalePackage, SysScalePackageDetailVo.class);
SysScalePackageDetailVo detailVo = MapstructUtils.convert(scalePackage, SysScalePackageDetailVo.class); // List<String> split = StrUtil.split(scalePackage.getScaleIds(), ",");
List<String> split = StrUtil.split(scalePackage.getScaleIds(), ","); // List<SysScale> sysScales = scaleMapper.selectList(new LambdaQueryWrapper<SysScale>()
List<SysScale> sysScales = scaleMapper.selectList(new LambdaQueryWrapper<SysScale>() // .select(SysScale::getScaleId, SysScale::getScaleName)
.select(SysScale::getScaleId, SysScale::getScaleName) // .in(SysScale::getScaleId, split));
.in(SysScale::getScaleId, split)); // detailVo.setScaleDetail(sysScales);
detailVo.setScaleDetail(sysScales); // return detailVo;
return detailVo; return baseMapper.selectVoById(packageId);
} }
/** /**