fix(tcm):检验检测开通接口修改

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import java.util.Date;
 
 /**
@@ -107,4 +107,12 @@ public class BaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;
 
+    @ApiModelProperty(value = "所属证书")
+    private String enterpriseCertSeq;
+
+    @ApiModelProperty(value = "字典表id")
+    private Long dictSeq;
+
+    @ApiModelProperty(value = "企业资质证书照片")
+    private JSONArray qualificationCertificateAttachment;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/service/IRegUnitInfoService.java

@@ -74,6 +74,7 @@ public interface IRegUnitInfoService {
 
     List<Menu> getDictionaryWithTreeFillId(String type) throws Exception;
     List<DataDictionary> getDictionaryListByType(String type) throws Exception;
+    List<DataDictionary> getDictionaryListInType(String type) throws Exception;
 
     List<DataDictionary> getXkItemList(String type);
 

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

@@ -145,7 +145,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 		// 使用单位资质
 		COMPANY_TYPE_CERT_TYPE_MAP.put("使用单位", "1232");
 		// 检验检测机构资质：细分为1233-1、1233-2
-		COMPANY_TYPE_CERT_TYPE_MAP.put("检验检测机构", "1233-1,1233-2");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("检验机构", "1233-1,1233-2");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("检测机构", "1233-2");
 		// 安装改造维修单位身份资质：充装单位-1231 制造单位-1236 设计单位-1235 安装改造维修单位-1234
 		COMPANY_TYPE_CERT_TYPE_MAP.put("安装改造维修单位", "1231,1234,1235,1236");
 		// 充装单位
@@ -242,6 +243,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 			for (BaseUnitLicence baseUnitLicence : unitLicencesCollect) {
 				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
 				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+				if (!ObjectUtils.isEmpty(baseUnitLicence.getQualificationCertificateAttachment())) {
+					baseUnitLicenceDto.setQualificationCertificateAttachment(JSONObject.parseArray(baseUnitLicence.getQualificationCertificateAttachment()));
+				}
 				unitLicenceDtos.add(baseUnitLicenceDto);
 			}
 		}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/RegUnitInfoController.java

@@ -222,6 +222,13 @@ public class RegUnitInfoController extends BaseController {
         return ResponseHelper.buildResponse(iRegUnitInfoService.getDictionaryListByType(type));
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/dataDictionaryListInType")
+    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询检验检测机构集合", notes = "根据字典类型查询检验检测机构集合")
+    public ResponseModel<List<DataDictionary>> dataDictionaryListInType(@RequestParam String type) throws Exception {
+        return ResponseHelper.buildResponse(iRegUnitInfoService.getDictionaryListInType(type));
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/management-unit/tree")
     @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")

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

@@ -529,6 +529,20 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
         return dictionaries.stream().parallel().filter(d -> d.getType().equals(type)).collect(Collectors.toList());
     }
 
+    @Override
+    public List<DataDictionary> getDictionaryListInType(String type) throws Exception {
+        List<DataDictionary> dictionaries = this.initAllDataDictionaryList();
+        if ("JYJC".equals(type)) {
+            return dictionaries.stream()
+                    .filter(d -> "1233-1".equals(d.getType()) || "1233-2".equals(d.getType()))
+                    .collect(Collectors.toList());
+        } else {
+            return dictionaries.stream()
+                    .filter(d -> type.equals(d.getType()))
+                    .collect(Collectors.toList());
+        }
+    }
+
     public List<DataDictionary> initAllDataDictionaryList() {
         List<DataDictionary> dictionaries;
         // 使用双重检查锁定