1.单位信息维护时冗余机构类型名称

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

@@ -110,6 +110,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 
     private static final Map<String ,String> JYJC_CERT_MAP = new HashMap<>();
 
+	/**
+	 * 机构类别字典类型
+	 */
+	private static final String JYJC_TYPE_DICT_CODE = "JYJC_TYPE";
+
     static {
 		JYJC_CERT_MAP.put("1233-1","检验机构");
 		JYJC_CERT_MAP.put("1233-2","检测机构");
@@ -590,12 +595,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 		//修改许可信息
 		List<BaseUnitLicence> licences = Lists.newArrayList();
+		List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
 		JSON.parseArray(JSON.toJSONString(map.get("unitLicences"))).forEach(obj -> {
 			BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject )obj, BaseUnitLicence.class);
 			baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String)map.get("useCode"));
 			baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String)map.get("useUnit"));
 			// 处理许可字典值对应名称
-			handleDictName(baseUnitLicence);
+			handleDictName(baseUnitLicence, dictionaries);
 			licences.add(baseUnitLicence);
 		});
 		if (!ValidationUtil.isEmpty(licences)){
@@ -636,9 +642,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 	 *
 	 * @param baseUnitLicence 包含许可证书信息的基类单位许可证书对象。
 	 */
-	private void handleDictName(BaseUnitLicence baseUnitLicence) {
-	    // 初始化所有数据字典列表
-	    List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
+	private void handleDictName(BaseUnitLicence baseUnitLicence, List<DataDictionary> dictionaries) {
 		// 当前登录账户信息
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		String companyType = selectedOrgInfo.getCompany().getCompanyType();
@@ -693,6 +697,15 @@ public class TzBaseEnterpriseInfoServiceImpl
 	            .findFirst();
 	    // 设置评估方式名称
 	    appraisalTypeOptional.ifPresent(baseUnitLicence::setAppraisalType);
+        // 检验、检测时冗余证书类型名称
+	    this.setAgencyTypeName(baseUnitLicence, dictionaries);
+	}
+
+	private void setAgencyTypeName(BaseUnitLicence baseUnitLicence, List<DataDictionary> dictionaries) {
+		if(StringUtils.isNotEmpty(baseUnitLicence.getAgencyType())){
+			Optional<DataDictionary>  op = dictionaries.stream().filter(d->d.getType().equals(JYJC_TYPE_DICT_CODE) && d.getCode().equals(baseUnitLicence.getAgencyType())).findAny();
+			op.ifPresent(dataDictionary -> baseUnitLicence.setAgencyTypeName(dataDictionary.getName()));
+		}
 	}
 
 	private void fillCertTypeName(BaseUnitLicence baseUnitLicence, List<DataDictionary> dictionaries, String companyType) {