feat(wms): 增加多级审批功能和审批任务管理
- 在WmsApproval实体类中增加审批类型、需要审批人数、已审批人数、最终状态字段 - 实现审批任务通过和驳回功能,支持单人和多级审批流程 - 创建WmsApprovalTask相关实体类、业务对象、数据访问层和控制器 - 集成部门领导查询机制,实现多级审批链路构建 - 更新审批控制器,添加审批任务相关的API接口 - 优化审批列表查询,集成审批任务信息展示 - 配置MyBatis映射文件,支持新的审批任务数据表结构
This commit is contained in:
@@ -20,7 +20,9 @@ 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.domain.vo.WmsApprovalTaskVo;
|
||||
import com.klp.service.IWmsApprovalService;
|
||||
import com.klp.service.IWmsApprovalTaskService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
@@ -36,6 +38,7 @@ import com.klp.common.core.page.TableDataInfo;
|
||||
public class WmsApprovalController extends BaseController {
|
||||
|
||||
private final IWmsApprovalService iWmsApprovalService;
|
||||
private final IWmsApprovalTaskService iWmsApprovalTaskService;
|
||||
|
||||
/**
|
||||
* 查询通用审批(支持请假/外出等申请的审批)列表
|
||||
@@ -97,4 +100,46 @@ public class WmsApprovalController extends BaseController {
|
||||
@PathVariable Long[] approvalIds) {
|
||||
return toAjax(iWmsApprovalService.deleteWithValidByIds(Arrays.asList(approvalIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批任务通过
|
||||
*
|
||||
* @param taskId 任务ID
|
||||
* @param approvalOpinion 审批意见
|
||||
*/
|
||||
@Log(title = "审批任务通过", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/approve")
|
||||
public R<Map<String, Object>> approveTask(
|
||||
@NotNull(message = "任务ID不能为空")
|
||||
@RequestParam Long taskId,
|
||||
@RequestParam(required = false) String approvalOpinion) {
|
||||
return R.ok(iWmsApprovalService.approveTask(taskId, approvalOpinion));
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批任务驳回
|
||||
*
|
||||
* @param taskId 任务ID
|
||||
* @param approvalOpinion 审批意见
|
||||
*/
|
||||
@Log(title = "审批任务驳回", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/reject")
|
||||
public R<Map<String, Object>> rejectTask(
|
||||
@NotNull(message = "任务ID不能为空")
|
||||
@RequestParam Long taskId,
|
||||
@RequestParam(required = false) String approvalOpinion) {
|
||||
return R.ok(iWmsApprovalService.rejectTask(taskId, approvalOpinion));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询审批任务列表
|
||||
*
|
||||
* @param approvalId 审批ID
|
||||
*/
|
||||
@GetMapping("/tasks/{approvalId}")
|
||||
public R<List<WmsApprovalTaskVo>> getTasks(@PathVariable Long approvalId) {
|
||||
return R.ok(iWmsApprovalTaskService.queryByApprovalId(approvalId));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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.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<WmsApprovalTaskVo> 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));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user