From c310e85a79c69e711076c7a246205d8cfe45ac75 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Dec 2022 09:23:04 +0800
Subject: [PATCH] 添加车辆变更审核流程
---
src/main/java/org/springblade/modules/application/controller/ApplicationController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/application/controller/ApplicationController.java b/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
index 315b403..cba6aa7 100644
--- a/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
+++ b/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
@@ -42,6 +42,8 @@
import org.springblade.modules.application.service.IApplicationService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+
/**
* 申请表 控制器
*
@@ -75,6 +77,16 @@
public R<IPage<ApplicationVO>> list(ApplicationEntity application, Query query) {
IPage<ApplicationEntity> pages = applicationService.page(Condition.getPage(query), Condition.getQueryWrapper(application));
return R.data(ApplicationWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 申请表 查询全部
+ */
+ @GetMapping("/getAll")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入application")
+ public R<List<ApplicationVO>> getAll(ApplicationVO applicationVO) {
+ return R.data(applicationService.getAll(applicationVO));
}
/**
@@ -149,8 +161,8 @@
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(applicationService.deleteLogic(Func.toLongList(ids)));
}
- //================================工作流========================================
+ //================================工作流========================================
/**
* 申请表 工作流开始
*/
@@ -176,14 +188,27 @@
}
/**
- * 完成任务
+ * 审批人员完成任务
*
* @param flow 审核信息
*/
@PostMapping("complete-task")
@ApiOperationSupport(order = 7)
- @ApiOperation(value = "完成任务", notes = "传入流程信息")
+ @ApiOperation(value = "审批人员完成任务", notes = "传入流程信息")
public R completeTask(@ApiParam("任务信息") @RequestBody BladeFlow flow, @RequestBody ApplicationEntity applicationEntity, @RequestBody RejectEntity rejectEntity) {
return R.status(applicationService.completeTask(flow,applicationEntity,rejectEntity));
}
+
+ /**
+ * 申请人员完成任务
+ *
+ * @param flow 审核信息
+ */
+ @PostMapping("user-complete-task")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "申请人员完成任务", notes = "传入流程信息")
+ public R userCompleteTask(@ApiParam("任务信息") @RequestBody BladeFlow flow, @RequestBody ApplicationEntity applicationEntity,@RequestBody BasicInfoEntity basicInfoEntity,
+ @RequestBody CarEntity carEntity, @RequestBody PlanEntity planEntity, @RequestBody SchemeEntity schemeEntity, @RequestBody GoodsEntity goodsEntity, @RequestBody RejectEntity rejectEntity) {
+ return R.status(applicationService.userCompleteTask(flow,applicationEntity,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity,rejectEntity));
+ }
}
--
Gitblit v1.9.3