feat(tcm):监管可查询所有的许可信息

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

@@ -194,14 +194,6 @@ public class TzBaseEnterpriseInfoController {
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, companyModels.get(0).getCompanyCode()));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/getAllInfoByUseCode")
-    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询企业详情，包含资质许可等", notes = "根据统一信用代码查询企业详情，包含资质许可等")
-    public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> getAllInfoByUseCode(String useCode) {
-        PageParam pageParam = new PageParam();
-        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, useCode));
-    }
-
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getInfoByUseCode", method = RequestMethod.GET)
     @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/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -174,16 +174,21 @@ public class TzBaseEnterpriseInfoServiceImpl
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
 				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
 		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<>();
-		Predicate<BaseUnitLicence> certTypePredicate;
-		if (INSPECTION_AND_TESTING_INSTITUTIONS.equals(companyType)) {
-			certTypePredicate = baseUnitLicence -> INSPECTION_AGENCY.equals(baseUnitLicence.getCertType()) ||
-					TESTING_INSTITUTIONS.equals(baseUnitLicence.getCertType());
+		List<BaseUnitLicence> unitLicencesCollect;
+		if ("监管机构".equals(companyType)) {
+			unitLicencesCollect = unitLicences;
 		} else {
-			certTypePredicate = baseUnitLicence -> companyType.contains(baseUnitLicence.getCertType());
+			Predicate<BaseUnitLicence> certTypePredicate;
+			if (INSPECTION_AND_TESTING_INSTITUTIONS.equals(companyType)) {
+				certTypePredicate = baseUnitLicence -> INSPECTION_AGENCY.equals(baseUnitLicence.getCertType()) ||
+						TESTING_INSTITUTIONS.equals(baseUnitLicence.getCertType());
+			} else {
+				certTypePredicate = baseUnitLicence -> companyType.contains(baseUnitLicence.getCertType());
+			}
+			unitLicencesCollect = unitLicences.stream()
+					.filter(certTypePredicate)
+					.collect(Collectors.toList());
 		}
-		List<BaseUnitLicence> unitLicencesCollect = unitLicences.stream()
-				.filter(certTypePredicate)
-				.collect(Collectors.toList());
 		if (!ValidationUtil.isEmpty(unitLicencesCollect)) {
 			for (BaseUnitLicence baseUnitLicence : unitLicencesCollect) {
 				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
@@ -217,7 +222,14 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Override
 	public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
-		return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
+		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
+		if (!ObjectUtils.isEmpty(tzBaseEnterpriseInfo)){
+			LambdaQueryWrapper<TzsBaseInstitution> lambda = new QueryWrapper<TzsBaseInstitution>().lambda();
+			lambda.eq(TzsBaseInstitution::getEnterpriseId, tzBaseEnterpriseInfo.getSequenceNbr());
+			TzsBaseInstitution tzsBaseInstitution = tzsBaseInstitutionService.getBaseMapper().selectOne(lambda);
+			tzBaseEnterpriseInfoDto.setRegUnitMessage(tzsBaseInstitution);
+		}
+		return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : tzBaseEnterpriseInfoDto;
 	}
 
 	private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){