Joshi
05447c21ef
- 修改审批任务服务接口返回类型为Map以支持复杂数据结构 - 新增WMS部门管理模块，包括实体、业务对象、控制器和实现类 - 添加部门树形结构支持和部门负责人管理功能 - 更新审批流程逻辑，集成部门领导审批机制 - 重构审批任务查询方法以关联审批详情和申请人信息 - 添加部门ID字段到请假和外出申请相关实体中 - 优化多级审批流程，支持基于部门层级的审批链路 - 移除废弃的导入语句并整理代码结构
101 lines
3.1 KiB
Java
101 lines
3.1 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.WmsApprovalTaskVo;
|
|
import com.klp.domain.bo.WmsApprovalTaskBo;
|
|
import com.klp.service.IWmsApprovalTaskService;
|
|
import com.klp.common.core.page.TableDataInfo;
|
|
|
|
/**
|
|
* 审批任务
|
|
*
|
|
* @author klp
|
|
* @date 2026-01-20
|
|
*/
|
|
@Validated
|
|
@RequiredArgsConstructor
|
|
@RestController
|
|
@RequestMapping("/wms/approvalTask")
|
|
public class WmsApprovalTaskController extends BaseController {
|
|
|
|
private final IWmsApprovalTaskService iWmsApprovalTaskService;
|
|
|
|
/**
|
|
* 查询审批任务列表
|
|
*/
|
|
@GetMapping("/list")
|
|
public TableDataInfo<Map<String, Object>> list(WmsApprovalTaskBo bo, PageQuery pageQuery) {
|
|
return iWmsApprovalTaskService.queryPageList(bo, pageQuery);
|
|
}
|
|
|
|
/**
|
|
* 导出审批任务列表
|
|
*/
|
|
@Log(title = "审批任务", businessType = BusinessType.EXPORT)
|
|
@PostMapping("/export")
|
|
public void export(WmsApprovalTaskBo bo, HttpServletResponse response) {
|
|
List<WmsApprovalTaskVo> list = iWmsApprovalTaskService.queryList(bo);
|
|
ExcelUtil.exportExcel(list, "审批任务", WmsApprovalTaskVo.class, response);
|
|
}
|
|
|
|
/**
|
|
* 获取审批任务详细信息
|
|
*
|
|
* @param taskId 主键
|
|
*/
|
|
@GetMapping("/{taskId}")
|
|
public R<WmsApprovalTaskVo> getInfo(@NotNull(message = "主键不能为空")
|
|
@PathVariable Long taskId) {
|
|
return R.ok(iWmsApprovalTaskService.queryById(taskId));
|
|
}
|
|
|
|
/**
|
|
* 新增审批任务
|
|
*/
|
|
@Log(title = "审批任务", businessType = BusinessType.INSERT)
|
|
@RepeatSubmit()
|
|
@PostMapping()
|
|
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsApprovalTaskBo bo) {
|
|
return toAjax(iWmsApprovalTaskService.insertByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 修改审批任务
|
|
*/
|
|
@Log(title = "审批任务", businessType = BusinessType.UPDATE)
|
|
@RepeatSubmit()
|
|
@PutMapping()
|
|
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsApprovalTaskBo bo) {
|
|
return toAjax(iWmsApprovalTaskService.updateByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 删除审批任务
|
|
*
|
|
* @param taskIds 主键串
|
|
*/
|
|
@Log(title = "审批任务", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{taskIds}")
|
|
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
|
@PathVariable Long[] taskIds) {
|
|
return toAjax(iWmsApprovalTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
|
|
}
|
|
}
|