From 553831c82c2e8f8ff7b230c4d536cf99c47ece5b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java b/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
index 993c1e1..9d78f0a 100644
--- a/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
+++ b/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.SaveDispatchUnitDTO;
import com.doumee.dao.business.model.DispatchUnit;
import com.doumee.service.business.DispatchUnitService;
import io.swagger.annotations.Api;
@@ -34,9 +35,27 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("business:dispatchunit:create")
- public ApiResponse create(@RequestBody DispatchUnit dispatchUnit) {
- return ApiResponse.success(dispatchUnitService.create(dispatchUnit));
+ public ApiResponse create(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ return ApiResponse.success(dispatchUnitService.create(saveDispatchUnitDTO));
}
+
+ @PreventRepeat
+ @ApiOperation("娣诲姞宸ョ")
+ @PostMapping("/createSolution")
+ @RequiresPermissions("business:dispatchunit:create")
+ public ApiResponse createSolution(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ return ApiResponse.success(dispatchUnitService.createSolution(saveDispatchUnitDTO));
+ }
+
+
+ @ApiOperation("淇敼淇℃伅")
+ @PostMapping("/editDispatchUnit")
+ @RequiresPermissions("business:dispatchunit:update")
+ public ApiResponse editDispatchUnit(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ dispatchUnitService.editDispatchUnit(saveDispatchUnitDTO);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@@ -85,6 +104,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:dispatchunit:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(dispatchUnitService.findById(id));
+ return ApiResponse.success(dispatchUnitService.detailById(id));
}
}
--
Gitblit v1.9.3