From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 040c6f8..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.*;
@@ -34,14 +35,23 @@
@PostMapping("/create")
@CloudRequiredPermission("business:approvetempl:create")
public ApiResponse create(@RequestBody ApproveTempl approveTempl,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ approveTempl.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(approveTemplService.create(approveTempl));
+ }
+ @PreventRepeat
+ @ApiOperation("鍙戝竷妯＄増")
+ @PostMapping("/save")
+ @CloudRequiredPermission("business:approvetempl:create")
+ public ApiResponse save(@RequestBody ApproveTempl approveTempl,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ approveTempl.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(approveTemplService.save(approveTempl));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:approvetempl:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- approveTemplService.deleteById(id);
+ approveTemplService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -49,7 +59,7 @@
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:approvetempl:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- approveTemplService.deleteByIdInBatch(this.getIdList(ids));
+ approveTemplService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -57,6 +67,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:approvetempl:update")
public ApiResponse updateById(@RequestBody ApproveTempl approveTempl,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ approveTempl.setLoginUserInfo(this.getLoginUser(token));
approveTemplService.updateById(approveTempl);
return ApiResponse.success(null);
}
@@ -75,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