Browse Source

2022/12/22 李仁杰

lwhhszx 2 years ago
parent
commit
036851f8b9

+ 0 - 5
PAS/src/main/java/cn/cslg/pas/controller/ClientController.java

@@ -63,11 +63,6 @@ public class ClientController {
     public String getAllClient(Integer id) {
         return Response.success(clientService.getClientByTenant(id));
     }
-    @GetMapping("getClientName")
-    @Operation(summary = "获得客户名称")
-    public String getClientName(Integer id) {
-        return Response.success(clientService.getClientName(id));
-    }
 
 }
 

+ 8 - 4
PAS/src/main/java/cn/cslg/pas/controller/SystemController.java

@@ -10,10 +10,7 @@ import cn.cslg.pas.domain.ProjectField;
 import cn.cslg.pas.domain.SystemDict;
 import cn.cslg.pas.domain.Task;
 import cn.cslg.pas.mapper.PatentMapper;
-import cn.cslg.pas.service.PatentFieldService;
-import cn.cslg.pas.service.PatentService;
-import cn.cslg.pas.service.SystemDictService;
-import cn.cslg.pas.service.TaskService;
+import cn.cslg.pas.service.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -41,6 +39,7 @@ public class SystemController {
     private final SystemDictService systemDictService;
     private final PatentService patentService;
     private final PatentFieldService patentFieldService;
+    private final ClientService clientService;
     @PostMapping("dict")
     @Operation(summary = "根据类型获得字典")
     public String getPageList(@RequestBody  List<String> dicts) {
@@ -79,6 +78,11 @@ public class SystemController {
     public String getFieldList(Integer projectId) {
         return Response.success(patentFieldService.getPageList(projectId));
     }
+    @PostMapping("getClientsByIds")
+    @Operation(summary = "根据客户Id获得客户")
+    public List<Map<String, Object>> getAllClient(@RequestBody  List<Integer> ids) {
+        return clientService.getClientName(ids);
+    }
 
 }
 

+ 11 - 3
PAS/src/main/java/cn/cslg/pas/service/ClientService.java

@@ -77,10 +77,18 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
         queryWrapper.eq(Client::getName, name);
         return this.getOne(queryWrapper);
     }
-    public String getClientName(Integer id) {
+    public List<Map<String,Object>> getClientName(List<Integer> ids) {
         LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Client::getId, id);
-        return this.getOne(queryWrapper).getName();
+        queryWrapper.in(Client::getId, ids);
+        List<Client> clients =this.list(queryWrapper);
+        List<Map<String,Object>> mapList =new ArrayList<>();
+        clients.forEach(item->{
+            Map<String,Object> map =new HashMap<>();
+            map.put("clientId",item.getId());
+            map.put("clientName",item.getName());
+            mapList.add(map);
+        });
+        return mapList;
     }
 
     public List<Client> getClientByTenant(Integer tenantId) {