From 1bfec53e4e3a196a3ca53e06e9bec88139cbb689 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 18:06:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 aa408e4..24ece38 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,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.DispatchUnitQueryDTO;
+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;
@@ -20,7 +22,7 @@
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Api(tags = "娲鹃仯鍗曚綅淇℃伅琛�")
@RestController
@@ -34,9 +36,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 +105,15 @@
@GetMapping("/{id}")
@RequiresPermissions("business:dispatchunit:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(dispatchUnitService.findById(id));
+ return ApiResponse.success(dispatchUnitService.detailById(id));
}
+
+ @ApiOperation("鏁版嵁鍒楄〃")
+ @PostMapping("/findListByDTO")
+ @RequiresPermissions("business:dispatchunit:query")
+ public ApiResponse<List<DispatchUnit>> findListByDTO (@RequestBody DispatchUnitQueryDTO dispatchUnitQueryDTO) {
+ return ApiResponse.success(dispatchUnitService.findByDTO(dispatchUnitQueryDTO));
+ }
+
+
}
--
Gitblit v1.9.3