小程序企业查询字典值转化

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.app.flc.biz.service.impl.RegUnitIcServiceImpl;
-import com.yeejoin.amos.boot.module.app.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.boot.module.app.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.app.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.app.api.dto.TzBaseEnterpriseInfoDto;
@@ -21,7 +19,6 @@ import com.yeejoin.amos.boot.module.app.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.app.api.entity.SpeUseUnit;
 import com.yeejoin.amos.boot.module.app.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.app.api.mapper.TzBaseEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.app.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.app.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.app.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.app.flc.api.dto.RegUnitIcDto;
@@ -30,19 +27,18 @@ import com.yeejoin.amos.boot.module.app.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.app.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.app.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.app.flc.api.mapper.RegUnitInfoMapper;
+import com.yeejoin.amos.boot.module.app.flc.biz.service.impl.RegUnitIcServiceImpl;
+import com.yeejoin.amos.boot.module.app.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -131,6 +127,16 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto,orgCodeList);
 	}
 
+	protected List equCategoryConversion (List equCategoryCodeArr) {
+		return iDataDictionaryService.getBaseMapper()
+				.selectList(new LambdaQueryWrapper<DataDictionary>()
+						.in(DataDictionary::getCode,equCategoryCodeArr)
+						.select(DataDictionary::getName))
+				.stream()
+				.map(DataDictionary::getName)
+				.collect(Collectors.toList());
+	}
+
 	@Override
 	public TzBaseEnterpriseInfoDto detail(Long id) {
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
@@ -141,7 +147,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
 			tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
 			tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
-			tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
+			tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : equCategoryConversion(JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory())));
 		}
 		// 许可信息
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()