diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java index 6d802b8..b5429b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java @@ -39,6 +39,7 @@ public class SysScaleOrderVo implements Serializable { */ @ExcelProperty(value = "量表id") private Long scaleId; + private String scaleName; /** * 发布批次号 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java index 306d140..108556a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java @@ -72,6 +72,11 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService { public TableDataInfo queryPageList(SysScaleOrderBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + for (SysScaleOrderVo record : records) { + SysScale scale = sysScaleMapper.selectById(record.getId()); + record.setScaleName(scale.getScaleName()); + } return TableDataInfo.build(result); }