companybase

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompanyStockApplyInfo.java

@@ -9,7 +9,7 @@ public class BranchCompanyStockApplyInfo {
     @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "JDBC")
     private Integer id;
 
-    @Column(name = "company_id")
+    @Column(name = "company_base_id")
     private Integer companyId;
 
     /**

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/CompanyBase.java

@@ -106,7 +106,7 @@ public class CompanyBase {
     @Column(name = "city_name")
     private String cityName;
 
-    @Column(name = "towm_name")
+    @Column(name = "town_name")
     private String townName;
 
 }
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class BranchCompanyFindDTO extends PageParam {
+
+    private Integer provinceCode;
+
+    private Integer cityCode;
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:06
+ */
+@Data
+public class BranchCompanyListDTO {
+
+     private Integer comnpanyBaseId;
+    /**
+     * 分公司名称
+     */
+    @ApiModelProperty("分公司名称")
+    private String name;
+    /**
+     * 公司封面
+     */
+    @ApiModelProperty("公司封面")
+    private String cover;
+
+    @ApiModelProperty("地址-省/直辖市")
+    private String provinceName;
+
+    @ApiModelProperty("地址-市")
+    private String cityName;
+
+    @ApiModelProperty("地址-镇/县")
+    private String townName;
+
+    @ApiModelProperty("具体地址")
+    private String address;
+    /**
+     * 负责人
+     */
+    @ApiModelProperty("负责人")
+    private String leader;
+
+    /**
+     * 负责人联系方式
+     */
+    @ApiModelProperty("负责人联系方式")
+    private String leaderContactInfo;
+    /**
+     *公司地址-纬度
+     */
+    @ApiModelProperty("公司地址-纬度")
+    private BigDecimal latitude;
+
+    /**
+     * 公司地址-经度
+     */
+    @ApiModelProperty("公司地址-经度")
+    private BigDecimal longitude;
+}

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:06
+ */
+@Data
+public class BranchCompanyListVO {
+
+     private Integer comnpanyBaseId;
+    /**
+     * 分公司名称
+     */
+    @ApiModelProperty("分公司名称")
+    private String name;
+    /**
+     * 公司封面
+     */
+    @ApiModelProperty("公司封面")
+    private String cover;
+
+    @ApiModelProperty("地址-省/直辖市")
+    private String provinceName;
+
+    @ApiModelProperty("地址-市")
+    private String cityName;
+
+    @ApiModelProperty("地址-镇/县")
+    private String townName;
+
+    @ApiModelProperty("具体地址")
+    private String address;
+    /**
+     * 负责人
+     */
+    @ApiModelProperty("负责人")
+    private String leader;
+
+    /**
+     * 负责人联系方式
+     */
+    @ApiModelProperty("负责人联系方式")
+    private String leaderContactInfo;
+    /**
+     *公司地址-纬度
+     */
+    @ApiModelProperty("公司地址-纬度")
+    private BigDecimal latitude;
+
+    /**
+     * 公司地址-经度
+     */
+    @ApiModelProperty("公司地址-经度")
+    private BigDecimal longitude;
+}

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

@@ -3,8 +3,6 @@ package com.xxfc.platform.vehicle.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author libin
  * @version 1.0
@@ -37,13 +35,13 @@ public class CompanyBaseVo {
     private String content;
 
     @ApiModelProperty("地址-省/直辖市")
-    private String province;
+    private String provinceName;
 
     @ApiModelProperty("地址-市")
-    private String city;
+    private String cityName;
 
     @ApiModelProperty("地址-镇/县")
-    private String town;
+    private String townName;
 
     @ApiModelProperty("具体地址")
     private String address;

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

@@ -21,7 +21,10 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
+import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -369,4 +372,26 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
             return  branComanyLeaderVo;
         }));
     }
+
+    public PageDataVO<BranchCompanyListVO> findBranchCompanyWithPage(BranchCompanyFindDTO branchCompanyFindDTO) {
+        PageDataVO<BranchCompanyListVO> pageDataVO = new PageDataVO<>();
+        PageDataVO<BranchCompanyListDTO> dataVO = PageDataVO.pageInfo(branchCompanyFindDTO.getPage(), branchCompanyFindDTO.getLimit(), () -> mapper.findBranchCompanys(branchCompanyFindDTO.getProvinceCode(), branchCompanyFindDTO.getCityCode()));
+        List<BranchCompanyListDTO> data = dataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            return pageDataVO;
+        }
+        List<BranchCompanyListVO> branchCompanyListVOS = new ArrayList<>();
+        BranchCompanyListVO branchCompanyListVO;
+        for (BranchCompanyListDTO companyListDTO : data) {
+             branchCompanyListVO = new BranchCompanyListVO();
+            BeanUtils.copyProperties(companyListDTO,branchCompanyListVO);
+            branchCompanyListVOS.add(branchCompanyListVO);
+        }
+        pageDataVO.setData(branchCompanyListVOS);
+        pageDataVO.setPageSize(dataVO.getPageSize());
+        pageDataVO.setPageNum(dataVO.getPageNum());
+        pageDataVO.setTotalPage(dataVO.getTotalPage());
+        pageDataVO.setTotalCount(dataVO.getTotalCount());
+        return pageDataVO;
+    }
 }

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO;
+import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
@@ -13,4 +15,6 @@ public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdLi
     List<BranchCompany> selectByZoneId(Map<String, Object> param);
 
     List<Integer> findCompanyIdsByAreaId(@Param("areaId") Integer areaId);
+
+    List<BranchCompanyListDTO > findBranchCompanys(@Param("provinceCode") Integer provinceCode,@Param("cityCode") Integer cityCode);
 }
\ No newline at end of file

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

@@ -9,7 +9,7 @@ import tk.mybatis.mapper.common.Mapper;
 
 public interface CompanyBaseMapper extends Mapper<CompanyBase> {
 
-    @Select("SELECT cb.name,cb.cover,cb.images,cb.describes,cb.content,cb.addr_province AS `provinceName`,cb.addr_city AS `cityName`,cb.addr_town AS `townName`,bc.addr_detail AS `address`  FROM (SELECT * FROM `company_base` WHERE `id`=#{id}) AS `cb` LEFT JOIN `branch_company` AS `bc` ON bc.company_base_id = cb.id;")
+    @Select("SELECT cb.name,cb.cover,cb.images,cb.describes,cb.content,cb.province_name AS `provinceName`,cb.city_name AS `cityName`,cb.town_name AS `townName`,bc.addr_detail AS `address`  FROM (SELECT * FROM `company_base` WHERE `id`=#{id}) AS `cb` LEFT JOIN `branch_company` AS `bc` ON bc.company_base_id = cb.id;")
 /*    @Results(value = {
             @Result(property = "name",column = "name"),
             @Result(property = "cover",column = "cover"),

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -19,7 +19,9 @@ import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
+import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -198,4 +200,10 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     Map<Integer, BranComanyLeaderVo> findCompanyLeaderMapByIds(@RequestParam("companyIds") List<Integer> companyIds){
         return baseBiz.findCompanyLeaderMapByIds(companyIds);
     }
+
+    @PostMapping("/app/unauth/companys")
+    public ObjectRestResponse<PageDataVO<BranchCompanyListVO>> findBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO){
+        PageDataVO<BranchCompanyListVO> pageDataVO = baseBiz.findBranchCompanyWithPage(branchCompanyFindDTO);
+        return ObjectRestResponse.succ(pageDataVO);
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyStockRightController.java

@@ -103,7 +103,7 @@ public class BranchCompanyStockRightController extends BaseController<BranchComp
      * @param applyVo
      * @return
      */
-    @PostMapping("apply")
+    @PostMapping("/app/unauth/apply")
     public RestResponse apply(@RequestBody BranchCompanyStockApplyVo applyVo) {
         if (applyVo.getCompanyId() == null || applyVo.getName() == null || applyVo.getTel() == null || applyVo.getCount() == null) {
             return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper" >
-  <resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.BranchCompany" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper">
+    <resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.BranchCompany">
         <!--
           WARNING - @mbg.generated
         -->
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="branch_type" property="branchType" jdbcType="INTEGER" />
-    <result column="subordinate_branch" property="subordinateBranch" jdbcType="INTEGER" />
-    <result column="addr_province" property="addrProvince" jdbcType="INTEGER" />
-    <result column="addr_city" property="addrCity" jdbcType="INTEGER" />
-    <result column="addr_town" property="addrTown" jdbcType="INTEGER" />
-    <result column="addr_detail" property="addrDetail" jdbcType="VARCHAR" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="branch_type" property="branchType" jdbcType="INTEGER"/>
+        <result column="subordinate_branch" property="subordinateBranch" jdbcType="INTEGER"/>
+        <result column="addr_province" property="addrProvince" jdbcType="INTEGER"/>
+        <result column="addr_city" property="addrCity" jdbcType="INTEGER"/>
+        <result column="addr_town" property="addrTown" jdbcType="INTEGER"/>
+        <result column="addr_detail" property="addrDetail" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="vehice_service_phone" property="vehiceServicePhone"/>
         <result column="tour_service_phone" property="tourServicePhone"/>
         <result column="longitude" property="longitude"/>
@@ -40,7 +40,8 @@
             order by distance asc
         </if>
     </select>
-    <select id="selectByZoneId" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
+    <select id="selectByZoneId" parameterType="java.util.Map"
+            resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
         select * from branch_company
         where zone_id = #{zoneId}
         <if test="ids != null and ids.size > 0">
@@ -53,4 +54,29 @@
     <select id="findCompanyIdsByAreaId" resultType="integer">
        select `id` from `branch_company` where `zone_id`=#{areaId}
    </select>
+
+    <select id="findBranchCompanys" resultType="com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO">
+        SELECT
+        cb.id AS `comnpanyBaseId`,
+        cb.province_name AS `provinceName`,
+        cb.city_name AS `cityName`,
+        cb.town_name AS `townName`,
+        bc.addr_detail AS `address`,
+        bc.NAME AS `name`,
+        cb.cover,
+        bc.leader,
+        bc.leader_contact_info AS `leaderContactInfo`,
+        bc.longitude,
+        bc.latitude
+        FROM
+        (SELECT * FROM `branch_company` WHERE `is_del`=0) AS `bc`
+        INNER JOIN (SELECT * FROM `company_base` WHERE `is_del`=0
+        <if test="provinceCode != null">
+           AND `addr_province`=#{provinceCode}
+        </if>
+        <if test="cityCode != null">
+           AND  `addr_city`=#{cityCode}
+        </if>
+        ) AS `cb` ON cb.id = bc.company_base_id
+    </select>
 </mapper>
\ No newline at end of file