feat(approval): 完善审批功能并统一返回数据结构
- 修改IWmsApprovalService接口方法返回类型为Map<String, Object> - 更新WmsApprovalController控制器响应类型以匹配服务层变更 - 在WmsApprovalServiceImpl中实现审批详情查询和创建人昵称转换功能 - 添加批量查询用户昵称优化性能 - 实现请假和外出申请的审批状态管理 - 扩展WmsLeaveRequestVo和WmsOutRequestVo添加创建人姓名字段 - 在请假和外出申请创建时自动生成对应的审批记录
This commit is contained in:
@@ -2,6 +2,7 @@ package com.klp.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
@@ -40,7 +41,7 @@ public class WmsApprovalController extends BaseController {
|
||||
* 查询通用审批(支持请假/外出等申请的审批)列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsApprovalVo> list(WmsApprovalBo bo, PageQuery pageQuery) {
|
||||
public TableDataInfo<Map<String, Object>> list(WmsApprovalBo bo, PageQuery pageQuery) {
|
||||
return iWmsApprovalService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
@@ -60,7 +61,7 @@ public class WmsApprovalController extends BaseController {
|
||||
* @param approvalId 主键
|
||||
*/
|
||||
@GetMapping("/{approvalId}")
|
||||
public R<WmsApprovalVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
public R<Map<String, Object>> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long approvalId) {
|
||||
return R.ok(iWmsApprovalService.queryById(approvalId));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user