Commit 6c4fc490 authored by zhangyingbin's avatar zhangyingbin

修改 根据企业名称查询许可信息接口 支持一次传多个企业名称

parent a78f2cd6
...@@ -36,7 +36,7 @@ public class TzBaseUnitLicenceController { ...@@ -36,7 +36,7 @@ public class TzBaseUnitLicenceController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/licences", method = RequestMethod.GET) @RequestMapping(value = "/licences", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据企业名称查询许可信息", notes = "根据企业名称查询许可信息") @ApiOperation(httpMethod = "GET", value = "根据企业名称查询许可信息", notes = "根据企业名称查询许可信息")
public ResponseModel<List<TzBaseUnitLicence>> getLicenceByCompanyName(String companyName) { public ResponseModel<List<TzBaseUnitLicence>> getLicenceByCompanyName(List<String> companyNames) {
return ResponseHelper.buildResponse(baseUnitLicenceService.getLicenceByCompanyName(companyName)); return ResponseHelper.buildResponse(baseUnitLicenceService.getLicenceByCompanyName(companyNames));
} }
} }
...@@ -27,26 +27,30 @@ public class TzBaseUnitLicenceServiceImpl extends BaseService<TzBaseUnitLicenceD ...@@ -27,26 +27,30 @@ public class TzBaseUnitLicenceServiceImpl extends BaseService<TzBaseUnitLicenceD
@Autowired @Autowired
TzBaseEnterpriseInfoServiceImpl baseEnterpriseInfoService; TzBaseEnterpriseInfoServiceImpl baseEnterpriseInfoService;
public List<TzBaseUnitLicence> getLicenceByCompanyName(String companyName){ public List<TzBaseUnitLicence> getLicenceByCompanyName(List<String> companyNames){
LambdaQueryWrapper<TzBaseEnterpriseInfo> baseEnterpriseInfoWrap = new LambdaQueryWrapper<>(); List<TzBaseUnitLicence> list = new ArrayList<>();
LambdaQueryWrapper<TzBaseUnitLicence> baseUnitLicenceWrap = new LambdaQueryWrapper<>(); for(String companyName: companyNames) {
baseEnterpriseInfoWrap.eq(TzBaseEnterpriseInfo::getUseUnit,companyName); LambdaQueryWrapper<TzBaseEnterpriseInfo> baseEnterpriseInfoWrap = new LambdaQueryWrapper<>();
TzBaseEnterpriseInfo baseEnterpriseInfo; LambdaQueryWrapper<TzBaseUnitLicence> baseUnitLicenceWrap = new LambdaQueryWrapper<>();
try { baseEnterpriseInfoWrap.eq(TzBaseEnterpriseInfo::getUseUnit, companyName);
baseEnterpriseInfo = baseEnterpriseInfoService.getOne(baseEnterpriseInfoWrap); TzBaseEnterpriseInfo baseEnterpriseInfo;
} catch (Exception e) { try {
return new ArrayList<>(); baseEnterpriseInfo = baseEnterpriseInfoService.getOne(baseEnterpriseInfoWrap);
} catch (Exception e) {
continue;
}
if (ValidationUtil.isEmpty(baseEnterpriseInfo)) {
continue;
}
String unitCode = baseEnterpriseInfo.getUseCode();
if (ValidationUtil.isEmpty(unitCode)) {
continue;
}
baseUnitLicenceWrap.eq(TzBaseUnitLicence::getUnitCode, unitCode);
List<TzBaseUnitLicence> unitLicenceList = this.list(baseUnitLicenceWrap);
list.addAll(unitLicenceList);
} }
if(ValidationUtil.isEmpty(baseEnterpriseInfo)){ return list;
return new ArrayList<>();
}
String unitCode = baseEnterpriseInfo.getUseCode();
if(ValidationUtil.isEmpty(unitCode)){
return new ArrayList<>();
}
baseUnitLicenceWrap.eq(TzBaseUnitLicence::getUnitCode,unitCode);
List<TzBaseUnitLicence> unitLicenceList = this.list(baseUnitLicenceWrap);
return unitLicenceList;
} }
} }
...@@ -17,9 +17,9 @@ public interface TzsServiceFeignClient { ...@@ -17,9 +17,9 @@ public interface TzsServiceFeignClient {
/** /**
* 根据企业名称查询许可信息 * 根据企业名称查询许可信息
* @param companyName 企业名称 * @param companyNames 企业名称(多个)
* @return * @return
*/ */
@RequestMapping(value = "/baseUnitLicence/licences", method = RequestMethod.GET) @RequestMapping(value = "/baseUnitLicence/licences", method = RequestMethod.GET)
ResponseModel<List<UnitLicence>> getLicenceByCompanyName(@RequestParam String companyName); ResponseModel<List<UnitLicence>> getLicenceByCompanyName(@RequestParam List<String> companyNames);
} }
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