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/PlatformJobCloudController.java | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java index 3943389..5a38288 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java @@ -19,6 +19,7 @@ import com.mchange.v2.beans.BeansUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -53,7 +54,7 @@ @GetMapping("/delete/{id}") @CloudRequiredPermission("business:platformjob:delete") public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - platformJobService.delete(id); + platformJobService.deleteById(id,this.getLoginUser(token)); return ApiResponse.success(null); } @@ -73,9 +74,21 @@ } @ApiOperation("鎵归噺鏇存柊wms鍚堝悓鎬昏繍杈撻噺") @GetMapping("/updateTotalNum") - @CloudRequiredPermission("business:platformjob:update") + @CloudRequiredPermission("business:platformjob:updateTotalNum") public ApiResponse updateTotalNum(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - wmsService.computjobTotalNum(this.getIdList(ids)); + List<Integer> idList =this.getIdList(ids); + if(idList == null || idList.size()==0){ + idList = new ArrayList<>(); + PlatformJob param = new PlatformJob(); + param.setIsdeleted(Constants.ZERO); + param.setOrigin(Constants.ONE); + List<PlatformJob> list= platformJobService.findList(param); + + for(PlatformJob j :list){ + idList.add(j.getId()); + } + } + wmsService.computjobTotalNum(idList); return ApiResponse.success(null); } @@ -140,4 +153,14 @@ platformJobService.signIn(signInDTO); return ApiResponse.success("鎿嶄綔鎴愬姛"); } + + + + @ApiOperation("鎵嬪姩瀹屾垚浣滀笟") + @PostMapping("/dealJobFinish") + public ApiResponse dealJobFinish (@RequestBody List<Integer> list, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + platformJobService.dealJobFinish(list,getLoginUser(token)); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + } -- Gitblit v1.9.3