|
@@ -16,9 +16,11 @@ import org.dromara.common.redis.utils.RedisUtils;
|
|
|
import org.dromara.main.domain.MainAudit;
|
|
import org.dromara.main.domain.MainAudit;
|
|
|
import org.dromara.main.domain.MainCompanyApply;
|
|
import org.dromara.main.domain.MainCompanyApply;
|
|
|
import org.dromara.main.domain.bo.MainCompanyApplyBo;
|
|
import org.dromara.main.domain.bo.MainCompanyApplyBo;
|
|
|
|
|
+import org.dromara.main.domain.dto.GeoPointDto;
|
|
|
import org.dromara.main.domain.vo.MainCompanyApplyVo;
|
|
import org.dromara.main.domain.vo.MainCompanyApplyVo;
|
|
|
import org.dromara.main.mapper.MainAuditMapper;
|
|
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.IMainCompanyApplyService;
|
|
import org.dromara.main.service.IMainCompanyApplyService;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -32,6 +34,7 @@ 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;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public TableDataInfo<MainCompanyApplyVo> queryPageList(MainCompanyApplyBo bo, PageQuery pageQuery) {
|
|
public TableDataInfo<MainCompanyApplyVo> queryPageList(MainCompanyApplyBo bo, PageQuery pageQuery) {
|
|
@@ -54,6 +57,7 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean insertByBo(MainCompanyApplyBo bo) {
|
|
public Boolean insertByBo(MainCompanyApplyBo bo) {
|
|
|
MainCompanyApply add = MapstructUtils.convert(bo, MainCompanyApply.class);
|
|
MainCompanyApply add = MapstructUtils.convert(bo, MainCompanyApply.class);
|
|
|
|
|
+ fillGeoPoint(add);
|
|
|
validEntityBeforeSave(add);
|
|
validEntityBeforeSave(add);
|
|
|
boolean flag = baseMapper.insert(add) > 0;
|
|
boolean flag = baseMapper.insert(add) > 0;
|
|
|
if (flag) {
|
|
if (flag) {
|
|
@@ -65,6 +69,7 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean updateByBo(MainCompanyApplyBo bo) {
|
|
public Boolean updateByBo(MainCompanyApplyBo bo) {
|
|
|
MainCompanyApply update = MapstructUtils.convert(bo, MainCompanyApply.class);
|
|
MainCompanyApply update = MapstructUtils.convert(bo, MainCompanyApply.class);
|
|
|
|
|
+ fillGeoPoint(update);
|
|
|
validEntityBeforeSave(update);
|
|
validEntityBeforeSave(update);
|
|
|
return baseMapper.updateById(update) > 0;
|
|
return baseMapper.updateById(update) > 0;
|
|
|
}
|
|
}
|
|
@@ -133,6 +138,7 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
|
|
|
apply.setApplyStatus(0);
|
|
apply.setApplyStatus(0);
|
|
|
apply.setAuthLetter(parseFirstOssId(bo.getAuthLetter()));
|
|
apply.setAuthLetter(parseFirstOssId(bo.getAuthLetter()));
|
|
|
apply.setAvatar(parseFirstOssId(bo.getAvatar()));
|
|
apply.setAvatar(parseFirstOssId(bo.getAvatar()));
|
|
|
|
|
+ fillGeoPoint(apply);
|
|
|
|
|
|
|
|
validEntityBeforeSave(apply);
|
|
validEntityBeforeSave(apply);
|
|
|
boolean insertResult = baseMapper.insert(apply) > 0;
|
|
boolean insertResult = baseMapper.insert(apply) > 0;
|
|
@@ -182,4 +188,10 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
|
|
|
throw new ServiceException("上传文件标识格式错误");
|
|
throw new ServiceException("上传文件标识格式错误");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ private void fillGeoPoint(MainCompanyApply entity) {
|
|
|
|
|
+ GeoPointDto geoPoint = companyGeoService.geocode(entity.getOfficeAddress());
|
|
|
|
|
+ entity.setLatitude(geoPoint.getLatitude());
|
|
|
|
|
+ entity.setLongitude(geoPoint.getLongitude());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|