Commit 3dce5429 authored by 韩桐桐's avatar 韩桐桐

fix(tcm):检验检测机构的项目代码

parent 205dd4ef
......@@ -61,12 +61,13 @@ public class TzBaseEnterpriseInfoServiceImpl
extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
implements ITzBaseEnterpriseInfoService {
public static final String HZXM = "HZXM";
/**
* 企业管理员变更缓存key前缀
*/
private final String adminChange = "ADMIN_CHANGE_";
@Autowired
RedisUtil redisUtil;
@Autowired
private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Autowired
BaseUnitLicenceServiceImpl baseUnitLicenceService;
......@@ -75,34 +76,24 @@ public class TzBaseEnterpriseInfoServiceImpl
@Autowired
RegUnitInfoServiceImpl regUnitInfoService;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
@Autowired
RegUnitInfoMapper regUnitInfoMapper;
@Autowired
TzsBaseInstitutionServiceImpl tzsBaseInstitutionService;
@Autowired
private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Autowired
private StartPlatformTokenService platformTokenService;
@Autowired
private SpeUseUnitServiceImpl speUseUnitService;
@Autowired
private AccessFeignService accessFeignService;
@Autowired
private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
@Autowired
RegUnitInfoMapper regUnitInfoMapper;
@Autowired
TzsBaseInstitutionServiceImpl tzsBaseInstitutionService;
@Autowired
private TzsUserInfoMapper tzsUserInfoMapper;
/**
* 企业管理员变更缓存key前缀
*/
private final String adminChange = "ADMIN_CHANGE_";
@Autowired
private EquipmentCategoryServiceImpl equipmentCategoryService;
......@@ -617,7 +608,7 @@ public class TzBaseEnterpriseInfoServiceImpl
// 查询项目代码对应的名称
Optional<String> itemCodeOptional = dictionaries.stream()
.filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") && d.getCode().equals(baseUnitLicence.getItemCode()))
.filter(d -> ((!ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-")) || HZXM.equals(d.getType())) && d.getCode().equals(baseUnitLicence.getItemCode()))
.map(DataDictionary::getName)
.findFirst();
// 设置项目代码名称
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment