From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 c897310..4dc5a74 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.*;
@@ -75,7 +76,19 @@
@GetMapping("/updateTotalNum")
@CloudRequiredPermission("business:platformjob:update")
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,13 @@
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);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3