From 7a62afb5cec9a5c7caf6babc1c63706d8fe516dc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
index 7d82a68..2fc63a8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
@@ -12,6 +12,7 @@
import com.doumee.service.business.ApproveTemplService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -85,10 +86,30 @@
ExcelExporter.build(ApproveTempl.class).export(approveTemplService.findPage(pageWrap).getRecords(), "瀹℃壒妯＄増淇℃伅琛�", response);
}
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
+ @ApiOperation("鏍规嵁Type鏌ヨ")
+ @GetMapping("/{type}")
@CloudRequiredPermission("business:approvetempl:query")
- public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(approveTemplService.findById(id));
+ public ApiResponse<ApproveTempl> findByType(@PathVariable Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ ApproveTempl templ =new ApproveTempl();
+ templ.setIsdeleted(Constants.ZERO);
+ templ.setType(type);
+ return ApiResponse.success(approveTemplService.findOne(templ));
}
+ @ApiOperation("鏍规嵁reasonId鏌ヨ")
+ @GetMapping("/findById/{id}")
+ @CloudRequiredPermission("business:approvetempl:query")
+ public ApiResponse<ApproveTempl> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ ApproveTempl templ =new ApproveTempl();
+ templ.setIsdeleted(Constants.ZERO);
+ templ.setId(id);
+ return ApiResponse.success(approveTemplService.findOne(templ));
+ }
+
+
+// @ApiOperation("鏍规嵁ID鏌ヨ")
+// @GetMapping("/{id}")
+// @CloudRequiredPermission("business:approvetempl:query")
+// public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// return ApiResponse.success(approveTemplService.findById(id));
+// }
}
--
Gitblit v1.9.3