配置文件修改

PCS/src/main/java/cn/cslg/permission/controller/SystemController.java

@@ -131,8 +131,8 @@ public class SystemController {
 
     @GetMapping("getPersonIdByName")
     @Operation(summary = "根据人员名称获得人员ID")
-    public List<Integer> getPersonIdByName(String personName) {
-        return systemService.getPersonIdByName(personName);
+    public List<Integer> getPersonIdByName(String personName,Boolean ifEqual) {
+        return systemService.getPersonIdByName(personName,ifEqual);
     }
 
     @PostMapping("/getPersonIdByNames")
@@ -170,4 +170,28 @@ public class SystemController {
 
     }
 
+    @GetMapping("/getPersonIdOrders")
+    @Operation(summary = "查询人员id排序")
+    public List<Integer> getPersonIdOrders(Integer orderType) {
+        return systemService.getPersonIdOrders(orderType);
+    }
+
+    @PostMapping("/getClintByIds")
+    @Operation(summary = "根据id查询客户")
+    public String getClintByIds(@RequestBody List<Integer> ids) {
+        return systemService.getClintByIds(ids);
+    }
+
+
+    @GetMapping("/getClientIdOrders")
+    @Operation(summary = "查询客户排序")
+    public List<Integer> getClientIdOrders(Integer orderType) {
+        return systemService.getClientIdOrders(orderType);
+    }
+
+    @GetMapping("getClientIdByName")
+    @Operation(summary = "根据客户名称获得人客户ID")
+    public List<Integer> getClientIdByName(String clientName,Boolean ifEqual) {
+        return systemService.getClientIdByName(clientName,ifEqual);
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/SystemService.java

@@ -6,27 +6,24 @@ import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.CacheUtils;
 import cn.cslg.permission.common.utils.DataUtils;
 import cn.cslg.permission.common.utils.Response;
-import cn.cslg.permission.common.utils.SecurityUtils.SecurityUtils;
 import cn.cslg.permission.domain.System;
 import cn.cslg.permission.domain.*;
-import cn.cslg.permission.domain.associate.AssoDepartPos;
-import cn.cslg.permission.domain.associate.AssoPerDp;
+
 import cn.cslg.permission.domain.sys.SysDict;
 import cn.cslg.permission.domain.sys.SysDictItem;
 import cn.cslg.permission.mapper.SysDictItemMapper;
 import cn.cslg.permission.service.associate.RoleFunctionDataService;
 import cn.dev33.satoken.stp.StpUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.v3.oas.models.security.SecurityScheme;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
+
 
 /**
  * @author 沈永艺
@@ -47,7 +44,7 @@ public class SystemService {
     private final PersonnelService personnelService;
     private final ApplicationService applicationService;
     private final TenantService tenantService;
-
+    private final ClientService clientService;
     /**
      * 获取用户信息
      *
@@ -212,10 +209,15 @@ public class SystemService {
      * @title 根据id查询人员
      * @description 获取所有的人员 不分租户
      */
-    public List<Integer> getPersonIdByName(String personName) {
+    public List<Integer> getPersonIdByName(String personName,Boolean ifEqual) {
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Personnel::getId);
-        queryWrapper.like(Personnel::getPersonnelName, personName);
+        if(ifEqual!=null&&ifEqual.equals(true)) {
+            queryWrapper.like(Personnel::getPersonnelName, personName);
+        }
+        else {
+            queryWrapper.eq(Personnel::getPersonnelName, personName);
+        }
         java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
         List<Integer> ids = personnelService.listObjs(queryWrapper, f);
         return ids;
@@ -321,4 +323,77 @@ public class SystemService {
 
         return personnel.updateById();
     }
+
+    /**
+     * 获得人员排序
+     * @param orderType
+     * @return
+     */
+    public List<Integer> getPersonIdOrders(Integer orderType) {
+        LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(Personnel::getId);
+        if(orderType.equals(0)){
+            queryWrapper.orderByAsc(Personnel::getPersonnelName);
+        }
+        else{
+            queryWrapper.orderByDesc(Personnel::getPersonnelName);
+        }
+        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
+        List<Integer> ids = personnelService.listObjs(queryWrapper, f);
+        return ids;
+    }
+
+    /**
+     * 根据id获取客户
+     * @param ids
+     * @return
+     */
+    public String getClintByIds(List<Integer> ids) {
+        List<Client> clientList = new ArrayList<>();
+        if (ids != null && ids.size() > 0) {
+            LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(Client::getId, ids);
+            clientList = clientService.list(queryWrapper);
+        }
+        return Response.success(clientList);
+    }
+
+    /**
+     * 获得客户排序
+     * @param orderType
+     * @return
+     */
+    public List<Integer> getClientIdOrders(Integer orderType) {
+        LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(Client::getId);
+        if(orderType.equals(0)){
+            queryWrapper.orderByAsc(Client::getName);
+        }
+        else{
+            queryWrapper.orderByDesc(Client::getName);
+        }
+        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
+        List<Integer> ids = clientService.listObjs(queryWrapper, f);
+        return ids;
+    }
+
+
+    /**
+     * @author 李仁杰
+     * @title 根据客户名称获得客户id
+     * @description 获取所有的人员 不分租户
+     */
+    public List<Integer> getClientIdByName(String clientName,Boolean ifEqual) {
+        LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(Client::getId);
+        if(ifEqual!=null&&ifEqual.equals(true)) {
+            queryWrapper.like(Client::getName, clientName);
+        }
+        else {
+            queryWrapper.eq(Client::getName, clientName);
+        }
+        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
+        List<Integer> ids = clientService.listObjs(queryWrapper, f);
+        return ids;
+    }
 }

PCS/src/main/resources/application.yml

@@ -23,7 +23,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: prodNetOut
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: