diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/TestVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/TestVo.java index 8f9d3db..4171826 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/TestVo.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/TestVo.java @@ -15,9 +15,9 @@ public class TestVo { private static Set set = new TreeSet<>(); static { - set.add("自有"); - set.add("待租"); - set.add("在租"); + set.add("16"); + set.add("17"); + set.add("43"); } public TestVo(){ diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java index 2fe98b0..27c5ae6 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java @@ -46,13 +46,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { @Override public List selectColtdList() { List list = bmCompanyInfoMapper.selectColtdList(); - ArrayList coltdTypeVos = new ArrayList<>(); - for (ColtdTypeVo coltdTypeVo : list) { - coltdTypeVo.setMaStatus(MaStatusEnum.getNameByCode(Integer.parseInt(coltdTypeVo.getMaStatus()))); - coltdTypeVo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(coltdTypeVo.getCompanyType()))); - coltdTypeVos.add(coltdTypeVo); - } - return coltdTypeVos; + + return list; } /** diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml index d781919..53cc429 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml @@ -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 gps_real_info g ON m.gps_code = g.gps_code 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 c.company_ltd, m.ma_status, g.lon, g.lat,maId