diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java index 959c038..eaa9d38 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: yxt-base(仓储基础信息供应商)
* File: BaseSupplierTypeFeignFallback.java
@@ -96,4 +98,12 @@ public class SupplierTypeRest { public ResultBean checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("orgSid")String dtoSid){ return supplierTypeService.checkUpdateCode(supplierTypeCode,useOrgSid,dtoSid); } + + @ApiOperation("获取供应商类型") + @PostMapping("/selSupplierType") + public ResultBean> selSupplierType(@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List pmsSupplierTypeDowns = supplierTypeService.selSupplierType(orgPath); + return rb.success().setData(pmsSupplierTypeDowns); + } } diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDown.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDown.java new file mode 100644 index 0000000..077143b --- /dev/null +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDown.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supplier.biz.suppliertype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.pmssuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class SupplierTypeDown implements Vo { + + private String sid; + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; +} diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java index a4e4216..7f5a99b 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java @@ -62,4 +62,7 @@ public interface SupplierTypeMapper extends BaseMapper { @Select("SELECT COUNT(*) FROM supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}") int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); + + @Select("select * from supplier_type where useOrgSid = #{useOrgSid} and isDelete = '0'") + List selSupplierType(String useOrgSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java index 578f66c..ebb7787 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java @@ -33,10 +33,16 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supplier.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.supplier.feign.portal.sysorganization.SysOrganizationVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PathVariable; +import java.util.Arrays; +import java.util.List; + /** * Project: yxt-base(仓储基础信息供应商)
* File: BaseSupplierTypeService.java
@@ -52,7 +58,10 @@ import org.springframework.web.bind.annotation.PathVariable; */ @Service public class SupplierTypeService extends MybatisBaseService { - + + @Autowired + SysOrganizationFeign sysOrganizationFeign; + public PagerVo listPageVo(PagerQuery pq) { SupplierTypeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -100,4 +109,21 @@ public class SupplierTypeService extends MybatisBaseService().success().setData(baseMapper.checkUpdateCode(supplierTypeCode,orgSid,dtoSid)); } + public List selSupplierType(String orgPath) { + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + List supplierTypeDowns = baseMapper.selSupplierType(useOrgSid); + return supplierTypeDowns; + } } \ No newline at end of file