diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierType.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierType.java index 6c7dd825e9..916553181c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierType.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierType.java @@ -52,6 +52,8 @@ public class PmsSupplierType extends BaseEntity { @ApiModelProperty("供应商类型名称") private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDetailsVo.java index 59dad8c216..84f4c2aebb 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDetailsVo.java @@ -52,6 +52,8 @@ public class PmsSupplierTypeDetailsVo implements Vo { @ApiModelProperty("供应商类型名称") private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") @@ -59,4 +61,6 @@ public class PmsSupplierTypeDetailsVo implements Vo { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("组织全路径") + private String orgPath; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDto.java index ba95a93384..5ad5ef7f3e 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDto.java @@ -52,6 +52,8 @@ public class PmsSupplierTypeDto implements Dto { @ApiModelProperty("供应商类型名称") private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") @@ -59,4 +61,6 @@ public class PmsSupplierTypeDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("组织全路径") + private String orgPath; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java index 881500874c..6325f085f5 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java @@ -50,6 +50,8 @@ public class PmsSupplierTypeQuery implements Query { @ApiModelProperty("供应商类型名称") private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java index f102202a8d..559aa52bc9 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java @@ -32,7 +32,11 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; +import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -50,6 +54,11 @@ import org.springframework.stereotype.Service; */ @Service public class PmsSupplierTypeService extends MybatisBaseService { + + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; public PagerVo listPageVo(PagerQuery pq) { PmsSupplierTypeQuery query = pq.getParams(); @@ -62,7 +71,13 @@ public class PmsSupplierTypeService extends MybatisBaseService + * File: SysOrganizationFeign.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "组织机构表") +@FeignClient( + contextId = "anrui-portal-SysOrganization", + name = "anrui-portal", + path = "v1/sysorganization") +public interface SysOrganizationFeign { + + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysorganization/SysOrganizationVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysorganization/SysOrganizationVo.java new file mode 100644 index 0000000000..6b7b8134c1 --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysorganization/SysOrganizationVo.java @@ -0,0 +1,88 @@ +package com.yxt.pms.feign.portal.sysorganization; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationVo.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
+ * Description: 组织机构表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") +@Data +public class SysOrganizationVo implements Vo { + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("子集") + private List children = new ArrayList<>(); + @ApiModelProperty("主管人员名称") + private String zgNames; + @ApiModelProperty("分管人员名称") + private String fgNames; + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + @ApiModelProperty("组织简称") + private String orgAbbre; + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + @ApiModelProperty("管理层级key") + private String orgLevelKey; + @ApiModelProperty("管理层级value") + private String orgLevelValue; + @ApiModelProperty("其他编码") + private String otherCode; + @ApiModelProperty("主管用户sid") + private String managerSid; +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysstafforg/SysStaffOrgFeign.java new file mode 100644 index 0000000000..1bab4be590 --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -0,0 +1,25 @@ +package com.yxt.pms.feign.portal.sysstafforg; + +import com.yxt.common.core.result.ResultBean; +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; + +/** + * @description: 人员与机构 + * @author: dimengzhe + * @date: 2024/3/6 + **/ +@FeignClient( + contextId = "anrui-portal-SysStaffOrg", + name = "anrui-portal", + path = "v1/sysstafforg") +public interface SysStaffOrgFeign { + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); +}