From 1d84a3c62eeee429f7d7d6339bcf9b504a9d7277 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 16 一月 2025 16:01:33 +0800
Subject: [PATCH] DNC流程配置、DNC部门处理
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java
index 5699c5a..2c7f306 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java
@@ -3,6 +3,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.activiti.entity.ActivitiDefinition;
import org.jeecg.modules.activiti.request.ActivitiDefinitionRequest;
@@ -33,9 +34,9 @@
@AutoLog(value = "DNC娴佺▼閰嶇疆-淇敼閰嶇疆")
@ApiOperation(value = "DNC娴佺▼閰嶇疆-淇敼閰嶇疆", notes = "DNC娴佺▼閰嶇疆-淇敼閰嶇疆")
- @PutMapping("/edit/{id}")
- public ResponseResult editDefinition(@PathVariable("id") String id, @RequestBody ActivitiDefinition definition) {
- boolean b = definitionService.editDefinition(id, definition);
+ @PutMapping("/edit")
+ public ResponseResult editDefinition( @RequestBody ActivitiDefinition definition) {
+ boolean b = definitionService.updateById(definition);
if(b)
return new ResponseResult(CommonCode.SUCCESS);
return new ResponseResult(CommonCode.FAIL);
@@ -53,8 +54,10 @@
@AutoLog(value = "DNC娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
@ApiOperation(value = "DNC娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃", notes = "DNC娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
- @GetMapping("/find/page/{page}/{size}")
- public QueryPageResponseResult<ActivitiDefinition> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, ActivitiDefinitionRequest request) {
- return definitionService.findPageList(page, size, request);
+ @GetMapping("/find/page")
+ public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ ActivitiDefinitionRequest request) {
+ return definitionService.findPageList(pageNo, pageSize, request);
}
}
--
Gitblit v1.9.3