Joshi
0e938df919
- 修改IWmsApprovalService接口方法返回类型为Map<String, Object> - 更新WmsApprovalController控制器响应类型以匹配服务层变更 - 在WmsApprovalServiceImpl中实现审批详情查询和创建人昵称转换功能 - 添加批量查询用户昵称优化性能 - 实现请假和外出申请的审批状态管理 - 扩展WmsLeaveRequestVo和WmsOutRequestVo添加创建人姓名字段 - 在请假和外出申请创建时自动生成对应的审批记录
101 lines
3.6 KiB
Java
101 lines
3.6 KiB
Java
package com.klp.controller;
|
|
|
|
import java.util.List;
|
|
import java.util.Arrays;
|
|
import java.util.Map;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.validation.constraints.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import com.klp.common.annotation.RepeatSubmit;
|
|
import com.klp.common.annotation.Log;
|
|
import com.klp.common.core.controller.BaseController;
|
|
import com.klp.common.core.domain.PageQuery;
|
|
import com.klp.common.core.domain.R;
|
|
import com.klp.common.core.validate.AddGroup;
|
|
import com.klp.common.core.validate.EditGroup;
|
|
import com.klp.common.enums.BusinessType;
|
|
import com.klp.common.utils.poi.ExcelUtil;
|
|
import com.klp.domain.vo.WmsApprovalVo;
|
|
import com.klp.domain.bo.WmsApprovalBo;
|
|
import com.klp.service.IWmsApprovalService;
|
|
import com.klp.common.core.page.TableDataInfo;
|
|
|
|
/**
|
|
* 通用审批（支持请假/外出等申请的审批）
|
|
*
|
|
* @author klp
|
|
* @date 2026-01-20
|
|
*/
|
|
@Validated
|
|
@RequiredArgsConstructor
|
|
@RestController
|
|
@RequestMapping("/wms/approval")
|
|
public class WmsApprovalController extends BaseController {
|
|
|
|
private final IWmsApprovalService iWmsApprovalService;
|
|
|
|
/**
|
|
* 查询通用审批（支持请假/外出等申请的审批）列表
|
|
*/
|
|
@GetMapping("/list")
|
|
public TableDataInfo<Map<String, Object>> list(WmsApprovalBo bo, PageQuery pageQuery) {
|
|
return iWmsApprovalService.queryPageList(bo, pageQuery);
|
|
}
|
|
|
|
/**
|
|
* 导出通用审批（支持请假/外出等申请的审批）列表
|
|
*/
|
|
@Log(title = "通用审批（支持请假/外出等申请的审批）", businessType = BusinessType.EXPORT)
|
|
@PostMapping("/export")
|
|
public void export(WmsApprovalBo bo, HttpServletResponse response) {
|
|
List<WmsApprovalVo> list = iWmsApprovalService.queryList(bo);
|
|
ExcelUtil.exportExcel(list, "通用审批（支持请假/外出等申请的审批）", WmsApprovalVo.class, response);
|
|
}
|
|
|
|
/**
|
|
* 获取通用审批（支持请假/外出等申请的审批）详细信息
|
|
*
|
|
* @param approvalId 主键
|
|
*/
|
|
@GetMapping("/{approvalId}")
|
|
public R<Map<String, Object>> getInfo(@NotNull(message = "主键不能为空")
|
|
@PathVariable Long approvalId) {
|
|
return R.ok(iWmsApprovalService.queryById(approvalId));
|
|
}
|
|
|
|
/**
|
|
* 新增通用审批（支持请假/外出等申请的审批）
|
|
*/
|
|
@Log(title = "通用审批（支持请假/外出等申请的审批）", businessType = BusinessType.INSERT)
|
|
@RepeatSubmit()
|
|
@PostMapping()
|
|
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsApprovalBo bo) {
|
|
return toAjax(iWmsApprovalService.insertByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 修改通用审批（支持请假/外出等申请的审批）
|
|
*/
|
|
@Log(title = "通用审批（支持请假/外出等申请的审批）", businessType = BusinessType.UPDATE)
|
|
@RepeatSubmit()
|
|
@PutMapping()
|
|
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsApprovalBo bo) {
|
|
return toAjax(iWmsApprovalService.updateByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 删除通用审批（支持请假/外出等申请的审批）
|
|
*
|
|
* @param approvalIds 主键串
|
|
*/
|
|
@Log(title = "通用审批（支持请假/外出等申请的审批）", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{approvalIds}")
|
|
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
|
@PathVariable Long[] approvalIds) {
|
|
return toAjax(iWmsApprovalService.deleteWithValidByIds(Arrays.asList(approvalIds), true));
|
|
}
|
|
}
|