diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java index be6216d..b7d23cc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java @@ -93,6 +93,13 @@ public class CoscoType { + //企业类型字典type + + public static final String ENTERPRISE_TYPE = "enterprise_type=supplier_manage_type"; + + + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IDictService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IDictService.java new file mode 100644 index 0000000..2bb01d8 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IDictService.java @@ -0,0 +1,13 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictProject; + +import java.util.List; + +public interface IDictService { + + + String getDictName(String code, String codeType); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/DictServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/DictServiceImpl.java new file mode 100644 index 0000000..702f15c --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/DictServiceImpl.java @@ -0,0 +1,28 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; + +import com.chinaunicom.mall.ebtp.common.base.client.DictClient; +import com.chinaunicom.mall.ebtp.common.base.client.SystemClient; +import com.chinaunicom.mall.ebtp.common.base.entity.DictProject; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + + +@Service +public class DictServiceImpl implements IDictService { + + @Autowired + private DictClient dictClient; + + + @Override + public String getDictName(String code, String codeType) { + DictProject dictProject = new DictProject(); + dictProject.setCode(code); + dictProject.setParentType(codeType); + return dictClient.getDictList(dictProject).getData().get(0).getDicName(); + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index 3e74fdd..5c22f8e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -10,6 +10,7 @@ import com.chinaunicom.mall.ebtp.common.base.entity.SysSupplierUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IDictService; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.common.ChineseName; @@ -100,6 +101,8 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl coscoSupplierBaseList = coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase); for (CoscoSupplierBase supplierBase : coscoSupplierBaseList){ - //TODO enterpriseType 转中文 String[] categoryIds = supplierBase.getCategoryId().split(","); List categoryIdList = Arrays.asList(categoryIds); List categoryNameList = coscoCategoryService.getCategoryNameListByIds(categoryIdList); supplierBase.setCategoryName(String.join(",", categoryNameList)); + supplierBase.setEnterpriseTypeCn(dictService.getDictName(supplierBase.getEnterpriseType(),CoscoType.ENTERPRISE_TYPE)); } return coscoSupplierBaseList; } @@ -209,7 +212,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl