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