companybase

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

@@ -3,20 +3,21 @@ 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 org.apache.ibatis.annotations.*;
 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 = {
+    @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;")
+/*    @Results(value = {
+            @Result(property = "name",column = "name"),
+            @Result(property = "cover",column = "cover"),
+            @Result(property = "cover",column = "cover"),
             @Result(property = "provinceName",column = "addr_province"),
             @Result(property = "cityName",column = "addr_city"),
             @Result(property = "townName",column = "addr_town")
-    })
+    })*/
+    @ResultType(value = CompanyBaseDetailDTO.class)
     CompanyBaseDetailDTO findCompanyBaseById(@Param("id") Integer id);
 }
\ No newline at end of file

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @description
  * @data 2019/8/23 12:16
  */
-@RestController
+@RestController("companyBaseApp")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 @RequestMapping("/company_base")
 public class CompanyBaseController {
@@ -24,7 +24,7 @@ public class CompanyBaseController {
      private final  CompanyBaseBiz companyBaseBiz;
 
 
-     @GetMapping("/detail/{id}")
+     @GetMapping("/app/unauth/detail/{id}")
     public ObjectRestResponse<CompanyBaseVo> findCompanyDetailById(@PathVariable(value = "id") Integer id){
           CompanyBaseVo companyBaseVo = companyBaseBiz.findCompanyDetailById(id);
          return ObjectRestResponse.succ(companyBaseVo);