From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 9 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..269bd23 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 @@ -4,9 +4,9 @@ import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.ApproveTempl; import com.doumee.service.business.ApproveTemplService; @@ -34,14 +34,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 +58,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 +66,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 +85,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