Merge branch 'lb_dev' into base-modify

ace-common/pom.xml

@@ -209,7 +209,7 @@
             <artifactId>spring-boot</artifactId>
             <version>2.1.3.RELEASE</version>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
             <version>2.1.0.RELEASE</version>
@@ -226,8 +226,12 @@
             <artifactId>feign-core</artifactId>
             <version>10.1.0</version>
             <scope>compile</scope>
+        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
 

ace-modules/ace-generator/pom.xml

@@ -16,8 +16,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,9 +10,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.4:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.4:3307/xxfc_uccn?useUnicode=true&characterEncoding=UTF-8
         username: root
-        password: e4549e9315f19a88
+        password: sslcloud123*()
     jackson:
         time-zone: GMT+8
         date-format: yyyy-MM-dd HH:mm:ss

ace-modules/ace-generator/src/main/resources/generator.properties

 #\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F
 
 #\u5305\u540D
-package=com.xxfc.platform.order
+package=com.xxfc.platform.uccn
 #\u4F5C\u8005
-author=zjw
+author=libin
 #Email
 email=18178966185@163.com
 #\u8868\u524D\u9519\u8BEF\u7684Unicode\u5B57\u7B26\u4E32!

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivityDTO.java

+package com.xxfc.platform.uccn.dto;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 15:51
+ */
+public class SummitActivityDTO {
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java

+package com.xxfc.platform.uccn.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 峰会活动
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-08-26 15:25:32
+ */
+@Data
+@Table(name = "summit_activity")
+public class SummitActivity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+
+    /**
+     * 活动主标题
+     */
+    @Column(name = "title")
+    @ApiModelProperty(value = "活动主标题")
+    private String title;
+
+    /**
+     * 副标题（不展示）
+     */
+    @Column(name = "subtitle")
+    @ApiModelProperty(value = "副标题（不展示）")
+    private String subtitle;
+
+    /**
+     * 活动主图
+     */
+    @Column(name = "banner")
+    @ApiModelProperty(value = "活动主图")
+    private String banner;
+
+    /**
+     * 开始时间
+     */
+    @Column(name = "start_time")
+    @ApiModelProperty(value = "开始时间")
+    private Integer startTime;
+
+    /**
+     * 结束时间
+     */
+    @Column(name = "end_time")
+    @ApiModelProperty(value = "结束时间")
+    private Integer endTime;
+
+    /**
+     * 报名截止时间（不展示）
+     */
+    @Column(name = "reg_close_time")
+    @ApiModelProperty(value = "报名截止时间（不展示）")
+    private Long regCloseTime;
+
+    /**
+     * 省编码
+     */
+    @Column(name = "province_code")
+    @ApiModelProperty(value = "省编码")
+    private Integer provinceCode;
+
+    /**
+     * 省
+     */
+    @Column(name = "province")
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 市编码
+     */
+    @Column(name = "city_code")
+    @ApiModelProperty(value = "市编码")
+    private Integer cityCode;
+
+    /**
+     * 市
+     */
+    @Column(name = "city")
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    /**
+     * 县/镇 编码
+     */
+    @Column(name = "town_code")
+    @ApiModelProperty(value = "县/镇 编码")
+    private Integer townCode;
+
+    /**
+     * 县/镇
+     */
+    @Column(name = "town")
+    @ApiModelProperty(value = "县/镇")
+    private String town;
+
+    /**
+     * 活动场地（地址格式）
+     */
+    @Column(name = "address")
+    @ApiModelProperty(value = "活动场地（地址格式）")
+    private String address;
+
+    /**
+     * 纬度（不展示）
+     */
+    @Column(name = "latitude")
+    @ApiModelProperty(value = "纬度（不展示）")
+    private BigDecimal latitude;
+
+    /**
+     * 经度 （不展示）
+     */
+    @Column(name = "longitude")
+    @ApiModelProperty(value = "经度 （不展示）")
+    private BigDecimal longitude;
+
+    /**
+     * 总人数
+     */
+    @Column(name = "limit_num")
+    @ApiModelProperty(value = "总人数")
+    private Integer limitNum;
+
+    /**
+     * 活动图文内容
+     */
+    @Column(name = "content")
+    @ApiModelProperty(value = "活动图文内容")
+    private String content;
+
+    /**
+     * 活动开关（1开，0关）
+     */
+    @Column(name = "is_show")
+    @ApiModelProperty(value = "活动开关（0关，1开）")
+    private Integer isShow;
+
+    /**
+     * 报名开关（0开，1关）
+     */
+    @Column(name = "is_open_reg")
+    @ApiModelProperty(value = "报名开关（0开，1关）")
+    private Integer isOpenReg;
+
+    /**
+     * 删除（0正常，1删除）
+     */
+    @Column(name = "is_del")
+    @ApiModelProperty(value = "删除（0正常，1删除）")
+    private Integer isDel;
+
+    /**
+     * 0是未发布，1是已发布
+     */
+    @Column(name = "is_publish")
+    @ApiModelProperty(value = "0是未发布，1是已发布")
+    private Integer isPublish;
+
+    /**
+     * 0是普通，1是置顶（首页展示）
+     */
+    @Column(name = "is_home_page")
+    @ApiModelProperty(value = "0是普通，1是置顶（首页展示）")
+    private Integer isHomePage;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "crt_user")
+    @ApiModelProperty(value = "创建人id")
+    private Integer crtUser;
+
+    /**
+     * 创建人姓名
+     */
+    @Column(name = "crt_name")
+    @ApiModelProperty(value = "创建人姓名")
+    private String crtName;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private Long crtTime;
+
+    /**
+     * 活动对象说明（不展示）
+     */
+    @Column(name = "act_desc")
+    @ApiModelProperty(value = "活动对象说明（不展示）")
+    private String actDesc;
+
+    /**
+     * 活动类型(保留，不展示)
+     */
+    @Column(name = "type")
+    @ApiModelProperty(value = "活动类型(保留，不展示)")
+    private Integer type;
+
+    /**
+     * 报名人数（不展示）
+     */
+    @Column(name = "will_num")
+    @ApiModelProperty(value = "报名人数（不展示）")
+    private Integer willNum;
+
+    /**
+     * 1:欣欣官网 2：滴房车官网 0：无限制
+     */
+    @Column(name = "location")
+    @ApiModelProperty(value = "1:欣欣官网 2：滴房车官网 0：无限制")
+    private Integer location;
+
+    /**
+     * 排序
+     */
+    @Column(name = "rank")
+    @ApiModelProperty(value = "排序")
+    private Integer rank;
+
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java

+package com.xxfc.platform.uccn.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 16:17
+ */
+@Data
+public class SummitActivityDetailVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    @ApiModelProperty(value = "活动主标题")
+    private String title;
+
+
+    @ApiModelProperty(value = "副标题（不展示）")
+    private String subtitle;
+
+
+    @ApiModelProperty(value = "活动主图")
+    private String banner;
+
+
+    @ApiModelProperty(value = "开始时间")
+    private Integer startTime;
+
+
+    @ApiModelProperty(value = "结束时间")
+    private Integer endTime;
+
+
+    @ApiModelProperty(value = "报名截止时间（不展示）")
+    private Long regCloseTime;
+
+
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+
+
+    @ApiModelProperty(value = "县/镇")
+    private String town;
+
+
+    @ApiModelProperty(value = "活动场地（地址格式）")
+    private String address;
+
+
+    @ApiModelProperty(value = "总人数")
+    private Integer limitNum;
+
+
+    @ApiModelProperty(value = "活动图文内容")
+    private String content;
+
+    @ApiModelProperty(value = "报名开关（0开，1关）")
+    private Integer isOpenReg;
+
+
+    @ApiModelProperty(value = "活动对象说明（不展示）")
+    @JsonIgnore
+    private String actDesc;
+
+    @ApiModelProperty(value = "活动类型(保留，不展示)")
+    @JsonIgnore
+    private Integer type;
+
+    @ApiModelProperty(value = "报名人数（不展示）")
+    @JsonIgnore
+    private Integer willNum;
+
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityVo.java

+package com.xxfc.platform.uccn.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 15:51
+ */
+@Data
+public class SummitActivityVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+
+    @ApiModelProperty(value = "活动主标题")
+    private String title;
+
+
+    @ApiModelProperty(value = "副标题（不展示）")
+    private String subtitle;
+
+
+    @ApiModelProperty(value = "活动主图")
+    private String banner;
+
+
+    @ApiModelProperty(value = "开始时间")
+    private Integer startTime;
+
+
+    @ApiModelProperty(value = "结束时间")
+    private Integer endTime;
+
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+
+    @ApiModelProperty(value = "县/镇")
+    private String town;
+
+
+    @ApiModelProperty(value = "活动场地（地址格式）")
+    private String address;
+
+
+    @ApiModelProperty(value = "排序")
+    @JsonIgnore
+    private Integer rank;
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

+package com.xxfc.platform.uccn.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
+import com.xxfc.platform.uccn.vo.SummitActivityVo;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.uccn.entity.SummitActivity;
+import com.xxfc.platform.uccn.mapper.SummitActivityMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import tk.mybatis.mapper.entity.Example;
+
+import java.time.Instant;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 峰会活动
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-08-26 15:25:32
+ */
+@Service
+public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActivity> {
+
+
+    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit) {
+        Example example = new Example(SummitActivity.class);
+        example.setOrderByClause("rank");
+        Example.Criteria criteria = example.createCriteria();
+        //未删除
+        criteria.andEqualTo("isDel",0);
+        //是首页展示
+        criteria.andEqualTo("isHomePage",1);
+        //已发布
+        criteria.andEqualTo("isPublish",1);
+        //活动未下架
+        criteria.andEqualTo("isShow",0);
+        //结束时间大于当前时间
+        //criteria.andGreaterThanOrEqualTo("endTime", Instant.now().toEpochMilli());
+        PageDataVO<SummitActivity> dataVO = PageDataVO.pageInfo(1, limit, () -> mapper.selectByExample(example));
+        List<SummitActivity> summitActivities = dataVO.getData();
+        if (CollectionUtils.isEmpty(summitActivities)){
+            return Collections.EMPTY_LIST;
+        }
+        return JSON.parseObject(JSON.toJSONString(summitActivities),new TypeReference<List<SummitActivityVo>>(){});
+    }
+
+    public SummitActivityDetailVo findSummitActivityDetailById(Integer id) {
+        SummitActivityDetailVo summitActivityDetailVo = new SummitActivityDetailVo();
+        SummitActivity summitActivity = mapper.selectByPrimaryKey(id);
+        BeanUtils.copyProperties(summitActivity, summitActivityDetailVo);
+        return summitActivityDetailVo;
+    }
+}
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/SummitActivityMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.entity.SummitActivity;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 峰会活动
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-08-26 15:25:32
+ */
+public interface SummitActivityMapper extends Mapper<SummitActivity> {
+	
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.uccn.biz.SummitActivityBiz;
+import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
+import com.xxfc.platform.uccn.vo.SummitActivityVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 
+ * @data 2019/8/26 15:36
+ */
+@RestController
+@RequestMapping("/summitActivity/app/unauth")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api("峰会")
+public class SummitActivityController{
+
+     private final  SummitActivityBiz summitActivityBiz;
+
+     @ApiOperation("官网首页展示")
+     @GetMapping("/home")
+     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit){
+
+          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit);
+          return ObjectRestResponse.succ(summitActivityVos);
+     }
+
+     @ApiOperation("峰会活动详情")
+     @GetMapping("/{id}")
+     public ObjectRestResponse<SummitActivityDetailVo> findSummitActivityDetailById(@PathVariable(value = "id") Integer id){
+           SummitActivityDetailVo summitActivityDetailVo = summitActivityBiz.findSummitActivityDetailById(id);
+          return ObjectRestResponse.succ(summitActivityDetailVo);
+     }
+}
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SummitActivityAdminController.java

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.uccn.biz.SummitActivityBiz;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 
+ * @data 2019/8/26 15:36
+ */
+@RestController
+@RequestMapping("/admin/summitActivity")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class SummitActivityAdminController {
+
+     private final  SummitActivityBiz summitActivityBiz;
+
+     @ApiOperation("保存或编辑")
+     @PostMapping("/save")
+     public ObjectRestResponse<Void>  saveSummitActivity(){
+
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("发布活动")
+     @PutMapping("/publish/{id}")
+     public ObjectRestResponse<Void> publishSumitActivity(@PathVariable(value = "id") Integer id){
+
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("下架活动")
+     @PutMapping("/soldout/{id}")
+     public ObjectRestResponse<Void> soldOutSumitActivity(@PathVariable(value = "id") Integer id){
+
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("删除活动")
+     @DeleteMapping("/{id}")
+     public ObjectRestResponse<Void> deleteSummitActivityById(@PathVariable(value = "id") Integer id){
+
+          return ObjectRestResponse.succ();
+     }
+}
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/resources/mapper/SummitActivityMapper.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.uccn.mapper.SummitActivityMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.uccn.entity.SummitActivity" id="summitActivityMap">
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="subtitle" column="subtitle"/>
+        <result property="banner" column="banner"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="regCloseTime" column="reg_close_time"/>
+        <result property="provinceCode" column="province_code"/>
+        <result property="province" column="province"/>
+        <result property="cityCode" column="city_code"/>
+        <result property="city" column="city"/>
+        <result property="townCode" column="town_code"/>
+        <result property="town" column="town"/>
+        <result property="address" column="address"/>
+        <result property="latitude" column="latitude"/>
+        <result property="longitude" column="longitude"/>
+        <result property="limitNum" column="limit_num"/>
+        <result property="content" column="content"/>
+        <result property="isShow" column="is_show"/>
+        <result property="isOpenReg" column="is_open_reg"/>
+        <result property="isDel" column="is_del"/>
+        <result property="isPublish" column="is_publish"/>
+        <result property="isHomePage" column="is_home_page"/>
+        <result property="crtUser" column="crt_user"/>
+        <result property="crtName" column="crt_name"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="actDesc" column="act_desc"/>
+        <result property="type" column="type"/>
+        <result property="willNum" column="will_num"/>
+        <result property="location" column="location"/>
+        <result property="rank" column="rank"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

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

@@ -8,6 +8,7 @@ import lombok.Data;
 @Data
 public class BranchCompanyStockApplyVo {
     Integer companyId;
+    Integer stockRightId;
     String name;
     String tel;
     Integer count;

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

@@ -13,6 +13,7 @@ import java.math.BigDecimal;
 @Data
 public class BranchCompanyStockRightDTO {
     private Integer id;
+    private Integer companyBaseId;
     private String companyName;
     private Integer balance;
     private Integer total;

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

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 public class BranchCompanyStockRightForWeChatOfficeVO {
 
    private Integer id;
+   private Integer companyBaseId;
    private String companyName;
    private Integer balance;
    private Integer total;

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

@@ -32,7 +32,7 @@ public class BranchCompanyStockApplyInfoBiz extends BaseBiz<BranchCompanyStockAp
      * @param applyVo
      */
     public void apply(BranchCompanyStockApplyVo applyVo) {
-        BranchCompanyStockRight stockInfo = branchCompanyStockRightBiz.selectByCompanyId(applyVo.getCompanyId());
+        BranchCompanyStockRight stockInfo = branchCompanyStockRightBiz.selectById(applyVo.getStockRightId());
         if (stockInfo == null) {
             throw new BaseException(ResCode.BRANCH_COMPANY_STOCK_UNEXIST.getDesc(), ResCode.BRANCH_COMPANY_STOCK_UNEXIST.getCode());
         }

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

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

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

@@ -87,7 +87,8 @@
     <select id="findWithPageByPriceOrCode"
             resultType="com.xxfc.platform.vehicle.pojo.dto.BranchCompanyStockRightDTO">
         SELECT
-        cb.id,
+        bcsir.id AS `id`,
+        cb.id AS `companyBaseId`,
         bcsir.balance,
         bcsir.total,
         bcsir.type,