From f19d4ca5f6847234b0b08193cf5cf8ac66e74ae2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 12 Jul 2024 14:16:02 +0800 Subject: [PATCH] =?UTF-8?q?wms=E8=B0=83=E7=94=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E6=A0=B9=E6=8D=AE=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=85=A8=E8=B7=AF=E5=BE=84=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/aggregation/SysStaffOrgRest.java | 12 +++++++- .../func/sysstafforg/SysStaffOrgByUserVo.java | 30 +++++++++++++++++++ .../func/sysstafforg/SysStaffOrgService.java | 6 ++++ .../portal/sysstafforg/SysStaffOrgFeign.java | 8 +++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgByUserVo.java diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffOrgRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffOrgRest.java index 93ffc87..be11bcc 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffOrgRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffOrgRest.java @@ -1,11 +1,14 @@ package com.yxt.wms.apiadmin.aggregation; import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysstafforg.SysStaffOrgByUserVo; import com.yxt.wms.biz.func.sysstafforg.SysStaffOrgService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/apiadmin/sysstafforg") public class SysStaffOrgRest { @@ -18,5 +21,12 @@ public class SysStaffOrgRest { @ApiOperation("根据用户组织全路径获取用户的分公司sid") ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath){ return sysStaffOrgService.getOrgSidByPath(orgPath); - }; + } + + @GetMapping("/selAllByOrgSidPath") + @ResponseBody + @ApiOperation("根据组织全路径查询当前部门下的所有员工") + public ResultBean> selAllByOrgSidPath(String orgSidPath) { + return sysStaffOrgService.selAllByOrgSidPath(orgSidPath); + } } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgByUserVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgByUserVo.java new file mode 100644 index 0000000..bfb6898 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgByUserVo.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.sysstafforg; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgVo.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo
+ * Description: 员工部门关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象") +@Data +public class SysStaffOrgByUserVo implements Vo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("员工姓名") + private String name; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgService.java b/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgService.java index f8c5aed..a9d6a62 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgService.java @@ -10,6 +10,8 @@ import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class SysStaffOrgService extends MybatisBaseService { @@ -19,4 +21,8 @@ public class SysStaffOrgService extends MybatisBaseService getOrgSidByPath(String orgPath) { return sysStaffOrgFeign.getOrgSidByPath(orgPath); } + + public ResultBean> selAllByOrgSidPath(String orgSidPath) { + return sysStaffOrgFeign.selAllByOrgSidPath(orgSidPath); + } } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java index a5338ce..1211606 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -1,12 +1,15 @@ package com.yxt.wms.feign.portal.sysstafforg; import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysstafforg.SysStaffOrgByUserVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; + /** * @description: 人员与机构 * @author: dimengzhe @@ -22,4 +25,9 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据用户组织全路径获取用户的分公司sid") ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); + + @GetMapping("/selAllByOrgSidPath") + @ResponseBody + @ApiOperation("根据组织全路径查询当前部门下的所有员工") + public ResultBean> selAllByOrgSidPath(String orgSidPath); }