companybase 字段添加

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

@@ -31,7 +31,7 @@ public class CompanyBaseDetailDTO implements Serializable {
      * 轮播图
      */
     @ApiModelProperty("轮播图")
-    private List<String> images;
+    private String images;
 
     @ApiModelProperty("公司简介")
     private String describes;
@@ -40,13 +40,13 @@ public class CompanyBaseDetailDTO implements Serializable {
     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-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/CompanyBaseVo.java

@@ -28,7 +28,7 @@ public class CompanyBaseVo {
      * 轮播图
      */
     @ApiModelProperty("轮播图")
-    private List<String> images;
+    private String images;
 
     @ApiModelProperty("公司简介")
     private String describes;

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

@@ -7,15 +7,22 @@ import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
 import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyBaseVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 14:23
+ */
 @Service
 @Slf4j
 public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
     public CompanyBaseVo findCompanyDetailById(Integer id) {
+        CompanyBaseVo companyBaseVo = new CompanyBaseVo();
         CompanyBaseDetailDTO companyBaseDetailDTO = mapper.findCompanyBaseById(id);
-        return null;
+        BeanUtils.copyProperties(companyBaseDetailDTO,companyBaseVo);
+        return companyBaseVo;
     }
-
-
 }

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

@@ -4,10 +4,19 @@ package com.xxfc.platform.vehicle.mapper;
 import com.xxfc.platform.vehicle.entity.CompanyBase;
 import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
 
 public interface CompanyBaseMapper extends Mapper<CompanyBase> {
 
+    @Select("SELECT cb.*,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 = "provinceName",column = "addr_province"),
+            @Result(property = "cityName",column = "addr_city"),
+            @Result(property = "townName",column = "addr_town")
+    })
     CompanyBaseDetailDTO findCompanyBaseById(@Param("id") Integer id);
 }
\ No newline at end of file