This commit is contained in:
parent
9c78a17208
commit
7d61f3da11
|
@ -14,6 +14,7 @@ import org.dromara.common.log.enums.BusinessType;
|
||||||
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.common.web.core.BaseController;
|
import org.dromara.common.web.core.BaseController;
|
||||||
|
import org.dromara.scale.domain.SysScalePublish;
|
||||||
import org.dromara.scale.domain.bo.BaseQueryBo;
|
import org.dromara.scale.domain.bo.BaseQueryBo;
|
||||||
import org.dromara.scale.domain.bo.SysScalePublishBo;
|
import org.dromara.scale.domain.bo.SysScalePublishBo;
|
||||||
import org.dromara.scale.domain.vo.EvaluationVo;
|
import org.dromara.scale.domain.vo.EvaluationVo;
|
||||||
|
@ -74,7 +75,7 @@ public class ScalePublishController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@SaCheckPermission("scale:publish:query")
|
@SaCheckPermission("scale:publish:query")
|
||||||
@GetMapping("/{batchNo}")
|
@GetMapping("/{batchNo}")
|
||||||
public R<SysScalePublishVo> getInfo(@NotNull(message = "主键不能为空")
|
public R<SysScalePublish> getInfo(@NotNull(message = "主键不能为空")
|
||||||
@PathVariable Long batchNo) {
|
@PathVariable Long batchNo) {
|
||||||
return R.ok(sysScalePublishService.queryById(batchNo));
|
return R.ok(sysScalePublishService.queryById(batchNo));
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,6 +74,7 @@ public class SysScalePublish {
|
||||||
//@TableField(fill = FieldFill.INSERT)
|
//@TableField(fill = FieldFill.INSERT)
|
||||||
private Long createBy;
|
private Long createBy;
|
||||||
|
|
||||||
|
private String createName;
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,6 +27,6 @@ public interface SysScalePublishMapper extends BaseMapperPlus<SysScalePublish, S
|
||||||
|
|
||||||
List<EvaluationVo> selectUndoneEvaluationVoList(@Param("batchNo") Long batchNo);
|
List<EvaluationVo> selectUndoneEvaluationVoList(@Param("batchNo") Long batchNo);
|
||||||
|
|
||||||
SysScalePublishVo selectPublishVoById(@Param("batchNo") Long batchNo);
|
SysScalePublish selectPublishById(@Param("batchNo") Long batchNo);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ 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.SysScalePublish;
|
||||||
import org.dromara.scale.domain.bo.BaseQueryBo;
|
import org.dromara.scale.domain.bo.BaseQueryBo;
|
||||||
import org.dromara.scale.domain.bo.SysScalePublishBo;
|
import org.dromara.scale.domain.bo.SysScalePublishBo;
|
||||||
import org.dromara.scale.domain.vo.EvaluationVo;
|
import org.dromara.scale.domain.vo.EvaluationVo;
|
||||||
|
@ -21,7 +22,7 @@ public interface ISysScalePublishService {
|
||||||
/**
|
/**
|
||||||
* 查询量发布
|
* 查询量发布
|
||||||
*/
|
*/
|
||||||
SysScalePublishVo queryById(Long batchNo);
|
SysScalePublish queryById(Long batchNo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询量发布列表
|
* 查询量发布列表
|
||||||
|
|
|
@ -60,8 +60,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
|
||||||
* 查询量发布
|
* 查询量发布
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SysScalePublishVo queryById(Long batchNo) {
|
public SysScalePublish queryById(Long batchNo) {
|
||||||
return baseMapper.selectPublishVoById(batchNo);
|
return baseMapper.selectPublishById(batchNo);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
order by d.dept_id
|
order by d.dept_id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectPublishVoById" resultType="org.dromara.scale.domain.vo.SysScalePublishVo">
|
<select id="selectPublishById" resultType="org.dromara.scale.domain.SysScalePublish">
|
||||||
select sp.*,
|
select sp.*,
|
||||||
u.nick_name as `createName`
|
u.nick_name as `createName`
|
||||||
from sys_scale_publish sp
|
from sys_scale_publish sp
|
||||||
|
|
Loading…
Reference in New Issue