From 2739964a8ed8e8e586971a5271a4d6bf2dbac2e5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 16 Dec 2022 17:10:03 +0800
Subject: [PATCH] 添加审核工作流
---
src/main/java/org/springblade/modules/application/controller/ApplicationController.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 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 a9a3b0e..315b403 100644
--- a/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
+++ b/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
@@ -24,13 +24,17 @@
import javax.validation.Valid;
import org.springblade.Application;
+import org.springblade.common.cache.UserCache;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.demo.leave.entity.ProcessLeave;
import org.springblade.modules.application.entity.*;
import org.springblade.modules.enterprise.entity.EnterpriseEntity;
+import org.springblade.modules.reject.entity.RejectEntity;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.application.vo.ApplicationVO;
@@ -100,7 +104,7 @@
@PostMapping("/saveVo")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "自定义新增", notes = "传入applicationVo")
- public R save(@Valid @RequestBody ApplicationEntity application, @RequestBody BasicInfoEntity basicInfoEntity, @RequestBody CarEntity carEntity,
+ public R saveVo(@Valid @RequestBody ApplicationEntity application, @RequestBody BasicInfoEntity basicInfoEntity, @RequestBody CarEntity carEntity,
@RequestBody PlanEntity planEntity, @RequestBody SchemeEntity schemeEntity, @RequestBody GoodsEntity goodsEntity) {
return R.status(applicationService.saveVo(application,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity));
}
@@ -145,6 +149,41 @@
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(applicationService.deleteLogic(Func.toLongList(ids)));
}
+ //================================工作流========================================
+ /**
+ * 申请表 工作流开始
+ */
+ @PostMapping("/start-process")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "工作流开始", notes = "传入applicationVo")
+ public R startProcess(@Valid @RequestBody ApplicationEntity application, @RequestBody BasicInfoEntity basicInfoEntity, @RequestBody CarEntity carEntity,
+ @RequestBody PlanEntity planEntity, @RequestBody SchemeEntity schemeEntity, @RequestBody GoodsEntity goodsEntity) {
+ return R.status(applicationService.startProcess(application,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity));
+ }
+ /**
+ * 详情
+ *
+ * @param businessId 主键
+ */
+ @GetMapping("/process-detail")
+ public R<ApplicationVO> detail(Long businessId) {
+ ApplicationEntity detail = applicationService.getById(businessId);
+ ApplicationVO applicationVO = applicationService.getVo(detail);
+ applicationVO.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName());
+ return R.data(applicationVO);
+ }
+
+ /**
+ * 完成任务
+ *
+ * @param flow 审核信息
+ */
+ @PostMapping("complete-task")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "完成任务", notes = "传入流程信息")
+ public R completeTask(@ApiParam("任务信息") @RequestBody BladeFlow flow, @RequestBody ApplicationEntity applicationEntity, @RequestBody RejectEntity rejectEntity) {
+ return R.status(applicationService.completeTask(flow,applicationEntity,rejectEntity));
+ }
}
--
Gitblit v1.9.3