大屏接口修改

This commit is contained in:
mashuai 2023-12-10 02:12:35 +08:00
parent 6a2141a7e4
commit bd902fd6aa
3 changed files with 6 additions and 11 deletions

View File

@ -15,9 +15,9 @@ public class TestVo {
private static Set<String> set = new TreeSet<>(); private static Set<String> set = new TreeSet<>();
static { static {
set.add("自有"); set.add("16");
set.add("待租"); set.add("17");
set.add("在租"); set.add("43");
} }
public TestVo(){ public TestVo(){

View File

@ -46,13 +46,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
@Override @Override
public List<ColtdTypeVo> selectColtdList() { public List<ColtdTypeVo> selectColtdList() {
List<ColtdTypeVo> list = bmCompanyInfoMapper.selectColtdList(); List<ColtdTypeVo> list = bmCompanyInfoMapper.selectColtdList();
ArrayList<ColtdTypeVo> coltdTypeVos = new ArrayList<>();
for (ColtdTypeVo coltdTypeVo : list) { return list;
coltdTypeVo.setMaStatus(MaStatusEnum.getNameByCode(Integer.parseInt(coltdTypeVo.getMaStatus())));
coltdTypeVo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(coltdTypeVo.getCompanyType())));
coltdTypeVos.add(coltdTypeVo);
}
return coltdTypeVos;
} }
/** /**

View File

@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
JOIN bm_company_info c ON m.own_co = c.company_id JOIN bm_company_info c ON m.own_co = c.company_id
JOIN gps_real_info g ON m.gps_code = g.gps_code JOIN gps_real_info g ON m.gps_code = g.gps_code
WHERE WHERE
m.ma_status IN ('16', '17', '43') and m.is_active = '1' m.ma_status IN ('16','17','43') and m.is_active = '1'
GROUP BY GROUP BY
c.company_ltd, m.ma_status, g.lon, g.lat,maId c.company_ltd, m.ma_status, g.lon, g.lat,maId