|
@@ -23,6 +23,8 @@ import org.dromara.main.mapper.MainAuditMapper;
|
|
|
import org.dromara.main.mapper.MainCompanyApplyMapper;
|
|
import org.dromara.main.mapper.MainCompanyApplyMapper;
|
|
|
import org.dromara.main.service.CompanyGeoService;
|
|
import org.dromara.main.service.CompanyGeoService;
|
|
|
import org.dromara.main.service.IMainCompanyApplyService;
|
|
import org.dromara.main.service.IMainCompanyApplyService;
|
|
|
|
|
+import org.dromara.system.service.ISysOssService;
|
|
|
|
|
+import org.dromara.system.domain.vo.SysOssVo;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
@@ -36,23 +38,31 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
|
|
|
private final MainCompanyApplyMapper baseMapper;
|
|
private final MainCompanyApplyMapper baseMapper;
|
|
|
private final MainAuditMapper mainAuditMapper;
|
|
private final MainAuditMapper mainAuditMapper;
|
|
|
private final CompanyGeoService companyGeoService;
|
|
private final CompanyGeoService companyGeoService;
|
|
|
|
|
+ private final ISysOssService ossService;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public TableDataInfo<MainCompanyApplyVo> queryPageList(MainCompanyApplyBo bo, PageQuery pageQuery) {
|
|
public TableDataInfo<MainCompanyApplyVo> queryPageList(MainCompanyApplyBo bo, PageQuery pageQuery) {
|
|
|
LambdaQueryWrapper<MainCompanyApply> lqw = buildQueryWrapper(bo);
|
|
LambdaQueryWrapper<MainCompanyApply> lqw = buildQueryWrapper(bo);
|
|
|
Page<MainCompanyApplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
Page<MainCompanyApplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
|
|
|
+ result.getRecords().forEach(this::fillOssUrls);
|
|
|
return TableDataInfo.build(result);
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<MainCompanyApplyVo> queryList(MainCompanyApplyBo bo) {
|
|
public List<MainCompanyApplyVo> queryList(MainCompanyApplyBo bo) {
|
|
|
LambdaQueryWrapper<MainCompanyApply> lqw = buildQueryWrapper(bo);
|
|
LambdaQueryWrapper<MainCompanyApply> lqw = buildQueryWrapper(bo);
|
|
|
- return baseMapper.selectVoList(lqw);
|
|
|
|
|
|
|
+ List<MainCompanyApplyVo> list = baseMapper.selectVoList(lqw);
|
|
|
|
|
+ list.forEach(this::fillOssUrls);
|
|
|
|
|
+ return list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public MainCompanyApplyVo queryById(Long id) {
|
|
public MainCompanyApplyVo queryById(Long id) {
|
|
|
- return baseMapper.selectVoById(id);
|
|
|
|
|
|
|
+ MainCompanyApplyVo vo = baseMapper.selectVoById(id);
|
|
|
|
|
+ if (vo != null) {
|
|
|
|
|
+ fillOssUrls(vo);
|
|
|
|
|
+ }
|
|
|
|
|
+ return vo;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -196,4 +206,27 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
|
|
|
entity.setLatitude(geoPoint.getLatitude());
|
|
entity.setLatitude(geoPoint.getLatitude());
|
|
|
entity.setLongitude(geoPoint.getLongitude());
|
|
entity.setLongitude(geoPoint.getLongitude());
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 将 OSS ID 转换为真实 URL 填充到 Vo 中
|
|
|
|
|
+ */
|
|
|
|
|
+ private void fillOssUrls(MainCompanyApplyVo vo) {
|
|
|
|
|
+ if (vo == null) return;
|
|
|
|
|
+ if (vo.getAvatar() != null) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ List<SysOssVo> ossList = ossService.listByIds(List.of(vo.getAvatar()));
|
|
|
|
|
+ vo.setAvatarUrl(ossList != null && !ossList.isEmpty() ? ossList.get(0).getUrl() : null);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ vo.setAvatarUrl(null);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (vo.getAuthLetter() != null) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ List<SysOssVo> ossList = ossService.listByIds(List.of(vo.getAuthLetter()));
|
|
|
|
|
+ vo.setAuthLetterUrl(ossList != null && !ossList.isEmpty() ? ossList.get(0).getUrl() : null);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ vo.setAuthLetterUrl(null);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|