feat(approval): 完善审批功能并统一返回数据结构
- 修改IWmsApprovalService接口方法返回类型为Map<String, Object> - 更新WmsApprovalController控制器响应类型以匹配服务层变更 - 在WmsApprovalServiceImpl中实现审批详情查询和创建人昵称转换功能 - 添加批量查询用户昵称优化性能 - 实现请假和外出申请的审批状态管理 - 扩展WmsLeaveRequestVo和WmsOutRequestVo添加创建人姓名字段 - 在请假和外出申请创建时自动生成对应的审批记录
This commit is contained in:
@@ -93,5 +93,7 @@ public class WmsLeaveRequestVo extends BaseEntity {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
private String createByName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -18,7 +19,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsOutRequestVo {
|
||||
public class WmsOutRequestVo extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -91,5 +92,7 @@ public class WmsOutRequestVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
private String createByName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user