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));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user