班组人员选择备用接口

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java

@@ -28,6 +28,7 @@ package org.springblade.desk.basic.feign;
 
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,9 +44,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface IWorkCenterClient {
 
-	String API_PREFIX = "/feign/workCenter";
+	String API_PREFIX = "/feign/client/workCenter";
 	String GET_BY_ID = API_PREFIX + "/getById";
-
+	String GET_TeamSet_BY_ID = API_PREFIX + "/getTeamSetById";
 	/**
 	 * 根据id获取作业中心
 	 *
@@ -54,4 +55,7 @@ public interface IWorkCenterClient {
 	 */
 	@GetMapping(GET_BY_ID)
 	R<WorkCenter> getById(@RequestParam("id") Long workCenterId);
+
+	@GetMapping(GET_TeamSet_BY_ID)
+	R<TeamSet> getTeamSetById(@RequestParam("id") Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java

@@ -2,10 +2,13 @@ package org.springblade.desk.basic.feign;
 
 
 import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springblade.desk.basic.service.ITeamSetService;
 import org.springblade.desk.basic.service.IWorkCenterService;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,10 +24,16 @@ import org.springframework.web.bind.annotation.RestController;
 public class WorkCenterClient implements IWorkCenterClient {
 
 	private final IWorkCenterService workCenterService;
-
+	@Resource
+	private ITeamSetService service;
 	@Override
 	public R<WorkCenter> getById(Long workCenterId) {
 		WorkCenter workCenter = workCenterService.getById(workCenterId);
 		return R.data(workCenter);
 	}
+
+	@Override
+	public R<TeamSet> getTeamSetById(Long id) {
+		return R.data(service.getById(id));
+	}
 }

blade-service/blade-system/pom.xml

@@ -38,6 +38,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-desk-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -50,7 +50,10 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
+import org.springblade.desk.basic.feign.IWorkCenterClient;
+import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.system.excel.UserExcel;
 import org.springblade.system.excel.UserImporter;
 import org.springblade.system.pojo.entity.User;
@@ -81,7 +84,7 @@ public class UserController {
 
     private final IUserService userService;
     private final IUserExtService userExtService;
-
+    private final IWorkCenterClient workCenterClient;
     /**
      * 查询单条
      */
@@ -94,6 +97,54 @@ public class UserController {
         return R.data(UserWrapper.build().entityVO(detail));
     }
 
+
+    @PostMapping("/getUnSelectUser")
+    @ApiOperationSupport(order = 31)
+    @Operation(summary = "获取未选择人员", description = "传入WorkCenter List")
+    public R<List<User>> getUnSelectUser(@Valid @RequestBody TeamSet teamSet) {
+        List<User> teams = new ArrayList<>();
+//        QueryWrapper<TeamSet> qw = Condition.getQueryWrapper(teamSet);
+//        TeamSet detail = service.getOne(qw);
+
+        TeamSet detail = workCenterClient.getTeamSetById(teamSet.getId()).getData();
+
+        if(detail != null){
+            String teamId = detail.getTeamMemberId();
+
+            if(null != teamId && !"".equals(teamId)){
+                List<Long> ids = Func.toLongList(teamId);
+                QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+                queryWrapper.notIn("id",ids);
+                teams = userService.list(queryWrapper);
+            }else{
+                QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+                teams = userService.list(queryWrapper);
+            }
+        }
+        return R.data(teams);
+    }
+
+
+    @PostMapping("/getSelectUser")
+    @ApiOperationSupport(order = 31)
+    @Operation(summary = "获取已选择人员", description = "传入WorkCenter List")
+    public R<List<User>> getSelectUser(@Valid @RequestBody TeamSet teamSet) {
+        List<User> teams = new ArrayList<>();
+        TeamSet detail = workCenterClient.getTeamSetById(teamSet.getId()).getData();
+        if(detail != null){
+            String teamId = detail.getTeamMemberId();
+            if(null != teamId && !"".equals(teamId)){
+                List<Long> ids = Func.toLongList(teamId);
+                QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+                queryWrapper.in("id",ids);
+                teams = userService.list(queryWrapper);
+            }
+        }
+        return R.data(teams);
+    }
+
+
+
     /**
      * 查询单条
      */