Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopFindDTO.java

@@ -12,9 +12,9 @@ import lombok.Data;
 @Data
 public class CampsiteShopFindDTO extends PageParam {
 
-     private Integer proviceCode;
+     private Integer addrProvince;
 
-     private Integer cityCode;
+     private Integer addrCity;
 
      private Integer type;
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -82,8 +82,8 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
 
     public PageDataVO<CampsiteShopPageVo> findCampsiteShopPageByType(CampsiteShopFindDTO campsiteShopFindDTO) {
         String campsite_cache_key = String.format("%s%s%s%s%s", campsiteShopFindDTO.getType() == null ? "" : campsiteShopFindDTO.getType() + ":",
-                campsiteShopFindDTO.getProviceCode() == null ? "" : campsiteShopFindDTO.getProviceCode() + ":",
-                campsiteShopFindDTO.getCityCode()==null?"":campsiteShopFindDTO.getCityCode()+":",
+                campsiteShopFindDTO.getAddrProvince() == null ? "" : campsiteShopFindDTO.getAddrProvince() + ":",
+                campsiteShopFindDTO.getAddrCity()==null?"":campsiteShopFindDTO.getAddrCity()+":",
                 campsiteShopFindDTO.getPage()+":",
                 campsiteShopFindDTO.getLimit());
         String  result = campHashOperations.get(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key);
@@ -93,7 +93,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         }
         PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = new PageDataVO<>();
 
-        PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(campsiteShopFindDTO.getPage(), campsiteShopFindDTO.getLimit(), () -> mapper.findAllCampsiteShopsByTypeOrCode(campsiteShopFindDTO.getType(),campsiteShopFindDTO.getProviceCode(),campsiteShopFindDTO.getCityCode()));
+        PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(campsiteShopFindDTO.getPage(), campsiteShopFindDTO.getLimit(), () -> mapper.findAllCampsiteShopsByTypeOrCode(campsiteShopFindDTO.getType(),campsiteShopFindDTO.getAddrProvince(),campsiteShopFindDTO.getAddrCity()));
         List<CampsiteShopPageDTO> campsiteShopPageDTOS = pageDataVO.getData();
         if (CollectionUtils.isEmpty(campsiteShopPageDTOS)) {
             campsiteShopPageDataVO.setData(Collections.EMPTY_LIST);

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

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 public class BranchCompanyFindDTO extends PageParam {
 
-    private Integer provinceCode;
+    private Integer addrProvince;
 
-    private Integer cityCode;
+    private Integer addrCity;
 }

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

@@ -14,9 +14,9 @@ import java.math.BigDecimal;
 @Data
 public class BranchCompanyStockRightFindDTO extends PageParam {
 
-     private Integer provinceCode;
+     private Integer addrProvince;
 
-     private Integer cityCode;
+     private Integer addrCity;
 
      private BigDecimal price;
 }

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

@@ -375,7 +375,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     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()));
+        PageDataVO<BranchCompanyListDTO> dataVO = PageDataVO.pageInfo(branchCompanyFindDTO.getPage(), branchCompanyFindDTO.getLimit(), () -> mapper.findBranchCompanys(branchCompanyFindDTO.getAddrProvince(), branchCompanyFindDTO.getAddrCity()));
         List<BranchCompanyListDTO> data = dataVO.getData();
         if (CollectionUtils.isEmpty(data)){
             return pageDataVO;

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

@@ -168,7 +168,7 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
     public PageDataVO<BranchCompanyStockRightForWeChatOfficeVO> findWithPageByPriceOrCode(BranchCompanyStockRightFindDTO branchCompanyStockRightFindDTO) {
          PageDataVO<BranchCompanyStockRightForWeChatOfficeVO> dataPage = new PageDataVO<>();
         PageDataVO<BranchCompanyStockRightDTO> pageDataVO = PageDataVO.pageInfo(branchCompanyStockRightFindDTO.getPage(), branchCompanyStockRightFindDTO.getLimit(),
-                () -> mapper.findWithPageByPriceOrCode(branchCompanyStockRightFindDTO.getPrice(), branchCompanyStockRightFindDTO.getProvinceCode(), branchCompanyStockRightFindDTO.getCityCode()));
+                () -> mapper.findWithPageByPriceOrCode(branchCompanyStockRightFindDTO.getPrice(), branchCompanyStockRightFindDTO.getAddrProvince(), branchCompanyStockRightFindDTO.getAddrCity()));
 
         List<BranchCompanyStockRightDTO> data = pageDataVO.getData();
         if (CollectionUtils.isEmpty(data)){

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

@@ -17,7 +17,7 @@
     <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo">
       select a.*, b.company_name
       from branch_company_stock_apply_info a
-      left join branch_company_stock_info b on a.company_id = b.id
+      left join `company_base` b on a.company_id = b.id
       order by a.create_time desc
     </select>
 </mapper>
\ No newline at end of file