123

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

@@ -25,6 +25,8 @@ public class CompanyVo extends PageParam {
     String  images;
     @ApiModelProperty("片区id")
     Integer  zoneId;
+    @ApiModelProperty("片区名称")
+    String  zoneName;
     @ApiModelProperty("公司简介")
     String  describes;
     @ApiModelProperty("详情")

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

@@ -44,6 +44,9 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
      @Autowired
     SysRegionMapper sysRegionMapper;
 
+     @Autowired
+    AreaBiz areaBiz;
+
     @Value("${branchCompanyPic.url}")
     private  String companyUrl;
 
@@ -159,10 +162,19 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         Integer stockId=companyVo.getStockId();
         String name="";
         String companyName="";
+        String zoneName="";
         if (companyBaseId!=null&&companyBaseId>0){
             CompanyBase companyBase=selectById(companyBaseId);
             BeanUtils.copyProperties(companyBase,companyVo);
             name=companyBase.getName();
+            Integer zoneId=companyBase.getZoneId();
+            if (zoneId!=null){
+                Area area=areaBiz.selectById(zoneId);
+                if (area!=null){
+                    zoneName=area.getName();
+                }
+            }
+
         }
         if (companyId!=null&&companyId>0){
             BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
@@ -176,6 +188,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         companyVo.setId(companyBaseId);
         companyVo.setName(name);
         companyVo.setCompanyName(companyName);
+        companyVo.setZoneName(zoneName);
         return  ObjectRestResponse.succ(companyVo);
     }
 

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

@@ -16,6 +16,7 @@
       c.vehice_service_phone as vehiceServicePhone,
       c.tour_service_phone as tourServicePhone,
       c.zone_id as zoneId,
+      a.name as zoneName,
       c.addr_province as addrProvince,
       c.province_name as provinceName,
       c.addr_city as addrCity,
@@ -35,6 +36,7 @@
       FROM   branch_company c
       LEFT JOIN company_base b ON c.company_base_id=b.id
       LEFT JOIN branch_company_stock_info_right r ON c.company_base_id=r.company_base_id
+      LEFT JOIN area a ON c.zone_id=a.id
         <where>
             b.is_del=0
             <if test="zoneId != null and zoneId !='' ">