Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchDTO.java

@@ -9,4 +9,7 @@ public class CompanySearchDTO {
     Integer addrCity;
     String lon;
     String lat;
+    Integer state = 1;
+    Integer isShow = 1;
+    Integer isDel = 0;
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -208,7 +208,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     public PageDataVO<BranchCompany> search(CompanySearchDTO vo) {
         PageHelper.startPage(vo.getPage(), vo.getLimit());
-        PageInfo<BranchCompany> branchCompanyPageInfo = new PageInfo<>(mapper.search(vo.getLon(), vo.getLat(), vo.getAddrCity()));
+        PageInfo<BranchCompany> branchCompanyPageInfo = new PageInfo<>(mapper.search(vo.getLon(), vo.getLat(), vo.getAddrCity(), vo.getState(), vo.getIsShow(), vo.getIsDel()));
         return PageDataVO.pageInfo(branchCompanyPageInfo);
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdListMapper<BranchCompany,Integer> {
-    List<BranchCompany> search(@Param("lon") String lon, @Param("lat") String lat, @Param("addrCity") Integer addrCity);
+    List<BranchCompany> search(@Param("lon") String lon, @Param("lat") String lat, @Param("addrCity") Integer addrCity, Integer state, Integer isShow, Integer isDel);
     List<BranchCompany> selectByZoneId(Map<String, Object> param);
 
     List<Integer> findCompanyIdsByAreaId(@Param("areaId") Integer areaId);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -36,6 +36,15 @@
             <if test="lon != null and lat != null">
                 and longitude is not null and latitude is not null
             </if>
+            <if test="state != null">
+                and state = #{state}
+            </if>
+            <if test="isShow != null">
+                and is_show = #{isShow}
+            </if>
+            <if test="isDel != null">
+                and is_del = #{isDel}
+            </if>
         </where>
         <if test="lon != null and lat != null">
             order by distance asc