Browse Source

Merge remote-tracking branch 'origin/dev' into dev

test
kilo 2 years ago
parent
commit
4b05648bce
  1. 85
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicBrandEntity.java
  2. 191
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicFreightEntity.java
  3. 85
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicHistoricalContractEntity.java
  4. 120
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicShopEntity.java
  5. 80
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStorageServicesEntity.java
  6. 75
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStoreBrandEntity.java
  7. 80
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStoreContactEntity.java
  8. 121
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicZonePriceEntity.java
  9. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataBrandEntity.java
  10. 11
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java
  11. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java
  12. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataHistoricalContractEntity.java
  13. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java
  14. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
  15. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java
  16. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java
  17. 39
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataZonePriceEntity.java
  18. 49
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStoreBrandClient.java
  19. 10
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java
  20. 10
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
  21. 12
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java
  22. 12
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataHistoricalContractClient.java
  23. 12
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataShopClient.java
  24. 12
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java
  25. 49
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java
  26. 12
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java
  27. 12
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataZonePriceClient.java
  28. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataBrandVO.java
  29. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataClientVO.java
  30. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataFreightVO.java
  31. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataHistoricalContractVO.java
  32. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataShopVO.java
  33. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStorageServicesVO.java
  34. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java
  35. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreContactVO.java
  36. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
  37. 150
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicHistoricalContractController.java
  38. 150
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStorageServicesController.java
  39. 75
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java
  40. 70
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java
  41. 70
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java
  42. 150
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataHistoricalContractController.java
  43. 70
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java
  44. 150
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java
  45. 75
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
  46. 70
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreContactController.java
  47. 70
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
  48. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataBrandDTO.java
  49. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataClientDTO.java
  50. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFreightDTO.java
  51. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataHistoricalContractDTO.java
  52. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataShopDTO.java
  53. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStorageServicesDTO.java
  54. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreBrandDTO.java
  55. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreContactDTO.java
  56. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java
  57. 111
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicBrandExcel.java
  58. 238
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicFreightExcel.java
  59. 111
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicHistoricalContractExcel.java
  60. 153
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicShopExcel.java
  61. 105
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStorageServicesExcel.java
  62. 99
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStoreBrandExcel.java
  63. 105
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStoreContactExcel.java
  64. 154
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicZonePriceExcel.java
  65. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataBrandExcel.java
  66. 4
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataClientExcel.java
  67. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFreightExcel.java
  68. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataHistoricalContractExcel.java
  69. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataShopExcel.java
  70. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStorageServicesExcel.java
  71. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreBrandExcel.java
  72. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreContactExcel.java
  73. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataZonePriceExcel.java
  74. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java
  75. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
  76. 14
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataFreightClient.java
  77. 14
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataHistoricalContractClient.java
  78. 14
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataShopClient.java
  79. 14
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java
  80. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java
  81. 14
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreContactClient.java
  82. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataZonePriceClient.java
  83. 37
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicBrandMapper.xml
  84. 58
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicFreightMapper.xml
  85. 37
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicHistoricalContractMapper.xml
  86. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicShopMapper.xml
  87. 36
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStorageServicesMapper.xml
  88. 35
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreBrandMapper.xml
  89. 36
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreContactMapper.xml
  90. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicZonePriceMapper.xml
  91. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandMapper.java
  92. 19
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandMapper.xml
  93. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java
  94. 12
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
  95. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFreightMapper.java
  96. 19
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFreightMapper.xml
  97. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.java
  98. 19
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.xml
  99. 16
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.java
  100. 19
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml
  101. Some files were not shown because too many files have changed in this diff Show More

85
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicBrandEntity.java

@ -1,85 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础品牌表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_brand")
@ApiModel(value = "BasicBrand对象", description = "基础品牌表")
@EqualsAndHashCode(callSuper = true)
public class BasicBrandEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 品牌名称
*/
@ApiModelProperty(value = "品牌名称")
private String brandName;
/**
* 品牌编号
*/
@ApiModelProperty(value = "品牌编号")
private String brandCode;
/**
* 品牌图标
*/
@ApiModelProperty(value = "品牌图标")
private String brandIcon;
/**
* 承接时间
*/
@ApiModelProperty(value = "承接时间")
private Date acceptanceTime;
}

191
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicFreightEntity.java

@ -1,191 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.math.BigDecimal;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础价格记录表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_freight")
@ApiModel(value = "BasicFreight对象", description = "基础价格记录表")
@EqualsAndHashCode(callSuper = true)
public class BasicFreightEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 计算方式;1件 2方 3公斤
*/
@ApiModelProperty(value = "计算方式;1件 2方 3公斤")
private Integer formulaMode;
/**
* 物品名称
*/
@ApiModelProperty(value = "物品名称")
private String itemName;
/**
* 门店品牌记录表
*/
@ApiModelProperty(value = "门店品牌记录表")
private String storeBrandId;
/**
* 运费
*/
@ApiModelProperty(value = "运费")
private BigDecimal freight;
/**
* 送货费用
*/
@ApiModelProperty(value = "送货费用")
private BigDecimal deliveryExpense;
/**
* 提货费用
*/
@ApiModelProperty(value = "提货费用")
private BigDecimal deliveryCharge;
/**
* 仓库管理费用
*/
@ApiModelProperty(value = "仓库管理费用")
private BigDecimal warehouseOverhead;
/**
* 仓储费用
*/
@ApiModelProperty(value = "仓储费用")
private BigDecimal storageCharge;
/**
* 装卸费用
*/
@ApiModelProperty(value = "装卸费用")
private BigDecimal terminalCharges;
/**
* 其他费用
*/
@ApiModelProperty(value = "其他费用")
private BigDecimal otherCharges;
/**
* 末端仓
*/
@ApiModelProperty(value = "末端仓")
private String singleColon;
/**
* 发货单位
*/
@ApiModelProperty(value = "发货单位")
private String forwardingUnit;
/**
* 门店
*/
@ApiModelProperty(value = "门店")
private String shop;
/**
* 品牌
*/
@ApiModelProperty(value = "品牌")
private String brand;
/**
* 服务类型;1 2干仓 3干仓配 4干配
*/
@ApiModelProperty(value = "服务类型;1 干 2干仓 3干仓配 4干配")
private Integer typeService;
/**
* 结算方;1 商场 2工厂
*/
@ApiModelProperty(value = "结算方;1 商场 2工厂")
private Integer clearingForm;
/**
* 一级品类
*/
@ApiModelProperty(value = "一级品类")
private String firstClassCategory;
/**
* 一口价
*/
@ApiModelProperty(value = "一口价")
private BigDecimal fixedPrice;
/**
* 干线费用
*/
@ApiModelProperty(value = "干线费用")
private BigDecimal trunkCharge;
/**
* 生效时间
*/
@ApiModelProperty(value = "生效时间")
private Date effectiveTime;
/**
* 截至时间
*/
@ApiModelProperty(value = "截至时间")
private Date expirationTime;
/**
* 类型
*/
@ApiModelProperty(value = "类型")
private String type;
/**
* 标识
*/
@ApiModelProperty(value = "标识")
private String identification;
/**
* 仓储时间端状态;1 0-30天 2 0-60天 3 60天以上
*/
@ApiModelProperty(value = "仓储时间端状态;1 0-30天 2 0-60天 3 60天以上")
private Integer warehousingTimeCharge;
/**
* 仓储时间端费用
*/
@ApiModelProperty(value = "仓储时间端费用")
private BigDecimal warehousingTimeStatus;
}

85
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicHistoricalContractEntity.java

@ -1,85 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 客户历史合同记录 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_historical_contract")
@ApiModel(value = "BasicHistoricalContract对象", description = "客户历史合同记录")
@EqualsAndHashCode(callSuper = true)
public class BasicHistoricalContractEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 客户id
*/
@ApiModelProperty(value = "客户id")
private String clientId;
/**
* 合同开始时间
*/
@ApiModelProperty(value = "合同开始时间")
private String contractStartTime;
/**
* 合同结束时间
*/
@ApiModelProperty(value = "合同结束时间")
private String contractEntTime;
/**
* 合同文件
*/
@ApiModelProperty(value = "合同文件")
private String leaseAccessories;
}

120
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicShopEntity.java

@ -1,120 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础门店表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_shop")
@ApiModel(value = "BasicShop对象", description = "基础门店表")
@EqualsAndHashCode(callSuper = true)
public class BasicShopEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 客户ID
*/
@ApiModelProperty(value = "客户ID")
private String clientId;
/**
* 门店编码
*/
@ApiModelProperty(value = "门店编码")
private String storeCode;
/**
* 门店名称
*/
@ApiModelProperty(value = "门店名称")
private String storeName;
/**
* 联系人
*/
@ApiModelProperty(value = "联系人")
private String linkman;
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
private String phone;
/**
*
*/
@ApiModelProperty(value = "省")
private String bladeRegionProvinceId;
/**
* 城市
*/
@ApiModelProperty(value = "城市")
private String bladeRegionCityId;
/**
*
*/
@ApiModelProperty(value = "区")
private String bladeRegionAreaId;
/**
* 详细地址
*/
@ApiModelProperty(value = "详细地址")
private String detailedAddress;
/**
* 入驻时间
*/
@ApiModelProperty(value = "入驻时间")
private Date checkInTime;
/**
* 退出时间
*/
@ApiModelProperty(value = "退出时间")
private Date postSetTime;
}

80
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStorageServicesEntity.java

@ -1,80 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 门店服务仓库表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_storage_services")
@ApiModel(value = "BasicStorageServices对象", description = "门店服务仓库表")
@EqualsAndHashCode(callSuper = true)
public class BasicStorageServicesEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 门店ID
*/
@ApiModelProperty(value = "门店ID")
private String shopId;
/**
* 发货单位
*/
@ApiModelProperty(value = "发货单位")
private String forwardingUnit;
/**
* 服务仓库
*/
@ApiModelProperty(value = "服务仓库")
private String warehouseService;
}

75
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStoreBrandEntity.java

@ -1,75 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 门店品牌中间表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_store_brand")
@ApiModel(value = "BasicStoreBrand对象", description = "门店品牌中间表")
@EqualsAndHashCode(callSuper = true)
public class BasicStoreBrandEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 门店ID
*/
@ApiModelProperty(value = "门店ID")
private String shopId;
/**
* 品牌ID
*/
@ApiModelProperty(value = "品牌ID")
private String brandId;
}

80
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStoreContactEntity.java

@ -1,80 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础门店联系人表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_store_contact")
@ApiModel(value = "BasicStoreContact对象", description = "基础门店联系人表")
@EqualsAndHashCode(callSuper = true)
public class BasicStoreContactEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 门店ID
*/
@ApiModelProperty(value = "门店ID")
private String shopId;
/**
* 联系人
*/
@ApiModelProperty(value = "联系人")
private String linkman;
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
private String phone;
}

121
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicZonePriceEntity.java

@ -1,121 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.math.BigDecimal;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 区域品牌价格表 实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@TableName("logpm_basic_zone_price")
@ApiModel(value = "BasicZonePrice对象", description = "区域品牌价格表")
@EqualsAndHashCode(callSuper = true)
public class BasicZonePriceEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(value = "预留2")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(value = "预留3")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(value = "预留4")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
*
*/
@ApiModelProperty(value = "省")
private String province;
/**
*
*/
@ApiModelProperty(value = "市")
private String city;
/**
* /
*/
@ApiModelProperty(value = "区/县")
private String district;
/**
* 品牌
*/
@ApiModelProperty(value = "品牌")
private String brand;
/**
* 费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用
*/
@ApiModelProperty(value = "费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用")
private String freightMark;
/**
* 费用
*/
@ApiModelProperty(value = "费用")
private String cost;
/**
* 仓储时间端状态;1 0-30天 2 0-60天 3 60天以上
*/
@ApiModelProperty(value = "仓储时间端状态;1 0-30天 2 0-60天 3 60天以上")
private Integer warehousingTimeStatus;
/**
* 仓储时间端费用
*/
@ApiModelProperty(value = "仓储时间端费用")
private BigDecimal warehousingTimeCharge;
/**
* 末端仓
*/
@ApiModelProperty(value = "末端仓")
private String goalGranary;
/**
* 标识
*/
@ApiModelProperty(value = "标识")
private Integer identification;
/**
* 状态
*/
@ApiModelProperty(value = "状态")
private Integer condition;
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataBrandEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础品牌表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_brand")
@ApiModel(value = "BasicdataBrand对象", description = "基础品牌表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataBrandEntity extends TenantEntity {
}

11
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicClientEntity.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java

@ -17,6 +17,7 @@
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -28,13 +29,13 @@ import org.springblade.core.tenant.mp.TenantEntity;
* 基础客户表 实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@TableName("logpm_basic_client")
@ApiModel(value = "BasicClient对象", description = "基础客户表")
@TableName("logpm_basicdata_client")
@ApiModel(value = "BasicdataClient对象", description = "基础客户表")
@EqualsAndHashCode(callSuper = true)
public class BasicClientEntity extends TenantEntity {
public class BasicdataClientEntity extends TenantEntity {
/**
* 预留1
@ -95,11 +96,13 @@ public class BasicClientEntity extends TenantEntity {
* 合同开始时间
*/
@ApiModelProperty(value = "合同开始时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date contractStartTime;
/**
* 合同结束时间
*/
@ApiModelProperty(value = "合同结束时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date contractEntTime;
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础价格记录表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_freight")
@ApiModel(value = "BasicdataFreight对象", description = "基础价格记录表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataFreightEntity extends TenantEntity {
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataHistoricalContractEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 客户历史合同记录 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_historical_contract")
@ApiModel(value = "BasicdataHistoricalContract对象", description = "客户历史合同记录")
@EqualsAndHashCode(callSuper = true)
public class BasicdataHistoricalContractEntity extends TenantEntity {
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础门店表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_shop")
@ApiModel(value = "BasicdataShop对象", description = "基础门店表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataShopEntity extends TenantEntity {
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 门店服务仓库表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_storage_services")
@ApiModel(value = "BasicdataStorageServices对象", description = "门店服务仓库表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataStorageServicesEntity extends TenantEntity {
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 门店品牌中间表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_store_brand")
@ApiModel(value = "BasicdataStoreBrand对象", description = "门店品牌中间表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataStoreBrandEntity extends TenantEntity {
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 基础门店联系人表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_store_contact")
@ApiModel(value = "BasicdataStoreContact对象", description = "基础门店联系人表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataStoreContactEntity extends TenantEntity {
}

39
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataZonePriceEntity.java

@ -0,0 +1,39 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 区域品牌价格表 实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@TableName("logpm_basicdata_zone_price")
@ApiModel(value = "BasicdataZonePrice对象", description = "区域品牌价格表")
@EqualsAndHashCode(callSuper = true)
public class BasicdataZonePriceEntity extends TenantEntity {
}

49
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStoreBrandClient.java

@ -1,49 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicStoreBrandEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* 基础品牌表 Feign接口类
*
* @author cyz
* @since 2023-05-15
*/
@FeignClient(
value = "basicBrand"
)
public interface IBasicStoreBrandClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top4";
/**
* 获取基础品牌表列表
*
* @param current 页号
* @param size 页数
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicStoreBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

10
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicBrandClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicBrandEntity;
import com.logpm.basicdata.entity.BasicdataBrandEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,12 +26,12 @@ import org.springframework.web.bind.annotation.RequestParam;
* 基础品牌表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicBrand"
value = "blade-basicdataBrand"
)
public interface IBasicBrandClient {
public interface IBasicdataBrandClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top1";
@ -44,6 +44,6 @@ public interface IBasicBrandClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

10
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicClientClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicClientEntity;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,12 +26,12 @@ import org.springframework.web.bind.annotation.RequestParam;
* 基础客户表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicClient"
value = "blade-basicdataClient"
)
public interface IBasicClientClient {
public interface IBasicdataClientClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top2";
@ -44,6 +44,6 @@ public interface IBasicClientClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicClientEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataClientEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

12
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicFreightClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicFreightEntity;
import com.logpm.basicdata.entity.BasicdataFreightEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RequestParam;
* 基础价格记录表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicFreight"
value = "blade-basicdataFreight"
)
public interface IBasicFreightClient {
public interface IBasicdataFreightClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top11";
String TOP = API_PREFIX + "/top3";
/**
* 获取基础价格记录表列表
@ -44,6 +44,6 @@ public interface IBasicFreightClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicFreightEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataFreightEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

12
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicHistoricalContractClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataHistoricalContractClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RequestParam;
* 客户历史合同记录 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicHistoricalContract"
value = "blade-basicdataHistoricalContract"
)
public interface IBasicHistoricalContractClient {
public interface IBasicdataHistoricalContractClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top22";
String TOP = API_PREFIX + "/top4";
/**
* 获取客户历史合同记录列表
@ -44,6 +44,6 @@ public interface IBasicHistoricalContractClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicHistoricalContractEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataHistoricalContractEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

12
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicShopClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataShopClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicShopEntity;
import com.logpm.basicdata.entity.BasicdataShopEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RequestParam;
* 基础门店表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicShop"
value = "blade-basicdataShop"
)
public interface IBasicShopClient {
public interface IBasicdataShopClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top3";
String TOP = API_PREFIX + "/top5";
/**
* 获取基础门店表列表
@ -44,6 +44,6 @@ public interface IBasicShopClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicShopEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataShopEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

12
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStorageServicesClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicStorageServicesEntity;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RequestParam;
* 门店服务仓库表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicStorageServices"
value = "blade-basicdataStorageServices"
)
public interface IBasicStorageServicesClient {
public interface IBasicdataStorageServicesClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top44";
String TOP = API_PREFIX + "/to6p";
/**
* 获取门店服务仓库表列表
@ -44,6 +44,6 @@ public interface IBasicStorageServicesClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicStorageServicesEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataStorageServicesEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

49
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java

@ -0,0 +1,49 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* 门店品牌中间表 Feign接口类
*
* @author cyz
* @since 2023-05-16
*/
@FeignClient(
value = "blade-basicdataStoreBrand"
)
public interface IBasicdataStoreBrandClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top7";
/**
* 获取门店品牌中间表列表
*
* @param current 页号
* @param size 页数
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicdataStoreBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

12
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStoreContactClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicStoreContactEntity;
import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RequestParam;
* 基础门店联系人表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicStoreContact"
value = "blade-basicdataStoreContact"
)
public interface IBasicStoreContactClient {
public interface IBasicdataStoreContactClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top55";
String TOP = API_PREFIX + "/top8";
/**
* 获取基础门店联系人表列表
@ -44,6 +44,6 @@ public interface IBasicStoreContactClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicStoreContactEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataStoreContactEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

12
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicZonePriceClient.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataZonePriceClient.java

@ -17,7 +17,7 @@
package com.logpm.basicdata.feign;
import org.springblade.core.mp.support.BladePage;
import com.logpm.basicdata.entity.BasicZonePriceEntity;
import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RequestParam;
* 区域品牌价格表 Feign接口类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@FeignClient(
value = "basicZonePrice"
value = "blade-basicdataZonePrice"
)
public interface IBasicZonePriceClient {
public interface IBasicdataZonePriceClient {
String API_PREFIX = "/client";
String TOP = API_PREFIX + "/top66";
String TOP = API_PREFIX + "/top9";
/**
* 获取区域品牌价格表列表
@ -44,6 +44,6 @@ public interface IBasicZonePriceClient {
* @return BladePage
*/
@GetMapping(TOP)
BladePage<BasicZonePriceEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
BladePage<BasicdataZonePriceEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicBrandVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataBrandVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicBrandEntity;
import com.logpm.basicdata.entity.BasicdataBrandEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 基础品牌表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicBrandVO extends BasicBrandEntity {
public class BasicdataBrandVO extends BasicdataBrandEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicClientVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataClientVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicClientEntity;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 基础客户表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicClientVO extends BasicClientEntity {
public class BasicdataClientVO extends BasicdataClientEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicFreightVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataFreightVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicFreightEntity;
import com.logpm.basicdata.entity.BasicdataFreightEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 基础价格记录表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicFreightVO extends BasicFreightEntity {
public class BasicdataFreightVO extends BasicdataFreightEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicHistoricalContractVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataHistoricalContractVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 客户历史合同记录 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicHistoricalContractVO extends BasicHistoricalContractEntity {
public class BasicdataHistoricalContractVO extends BasicdataHistoricalContractEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicShopVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataShopVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicShopEntity;
import com.logpm.basicdata.entity.BasicdataShopEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 基础门店表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicShopVO extends BasicShopEntity {
public class BasicdataShopVO extends BasicdataShopEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicStorageServicesVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStorageServicesVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicStorageServicesEntity;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 门店服务仓库表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicStorageServicesVO extends BasicStorageServicesEntity {
public class BasicdataStorageServicesVO extends BasicdataStorageServicesEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicStoreBrandVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicStoreBrandEntity;
import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 门店品牌中间表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicStoreBrandVO extends BasicStoreBrandEntity {
public class BasicdataStoreBrandVO extends BasicdataStoreBrandEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicStoreContactVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreContactVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicStoreContactEntity;
import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 基础门店联系人表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicStoreContactVO extends BasicStoreContactEntity {
public class BasicdataStoreContactVO extends BasicdataStoreContactEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicZonePriceVO.java → blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.vo;
import com.logpm.basicdata.entity.BasicZonePriceEntity;
import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,11 +25,11 @@ import lombok.EqualsAndHashCode;
* 区域品牌价格表 视图实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicZonePriceVO extends BasicZonePriceEntity {
public class BasicdataZonePriceVO extends BasicdataZonePriceEntity {
private static final long serialVersionUID = 1L;
}

150
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicHistoricalContractController.java

@ -1,150 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
import com.logpm.basicdata.vo.BasicHistoricalContractVO;
import com.logpm.basicdata.excel.BasicHistoricalContractExcel;
import com.logpm.basicdata.service.IBasicHistoricalContractService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
/**
* 客户历史合同记录 控制器
*
* @author cyz
* @since 2023-05-15
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicHistoricalContract")
@Api(value = "客户历史合同记录", tags = "客户历史合同记录接口")
public class BasicHistoricalContractController extends BladeController {
private final IBasicHistoricalContractService basicHistoricalContractService;
/**
* 客户历史合同记录 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicHistoricalContract")
public R<BasicHistoricalContractEntity> detail(BasicHistoricalContractEntity basicHistoricalContract) {
BasicHistoricalContractEntity detail = basicHistoricalContractService.getOne(Condition.getQueryWrapper(basicHistoricalContract));
return R.data(detail);
}
/**
* 客户历史合同记录 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicHistoricalContract")
public R<IPage<BasicHistoricalContractEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicHistoricalContract, Query query) {
IPage<BasicHistoricalContractEntity> pages = basicHistoricalContractService.page(Condition.getPage(query), Condition.getQueryWrapper(basicHistoricalContract, BasicHistoricalContractEntity.class));
return R.data(pages);
}
/**
* 客户历史合同记录 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicHistoricalContract")
public R<IPage<BasicHistoricalContractVO>> page(BasicHistoricalContractVO basicHistoricalContract, Query query) {
IPage<BasicHistoricalContractVO> pages = basicHistoricalContractService.selectBasicHistoricalContractPage(Condition.getPage(query), basicHistoricalContract);
return R.data(pages);
}
/**
* 客户历史合同记录 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicHistoricalContract")
public R save(@Valid @RequestBody BasicHistoricalContractEntity basicHistoricalContract) {
return R.status(basicHistoricalContractService.save(basicHistoricalContract));
}
/**
* 客户历史合同记录 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicHistoricalContract")
public R update(@Valid @RequestBody BasicHistoricalContractEntity basicHistoricalContract) {
return R.status(basicHistoricalContractService.updateById(basicHistoricalContract));
}
/**
* 客户历史合同记录 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicHistoricalContract")
public R submit(@Valid @RequestBody BasicHistoricalContractEntity basicHistoricalContract) {
return R.status(basicHistoricalContractService.saveOrUpdate(basicHistoricalContract));
}
/**
* 客户历史合同记录 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicHistoricalContractService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicHistoricalContract")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicHistoricalContract")
public void exportBasicHistoricalContract(@ApiIgnore @RequestParam Map<String, Object> basicHistoricalContract, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicHistoricalContractEntity> queryWrapper = Condition.getQueryWrapper(basicHistoricalContract, BasicHistoricalContractEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicHistoricalContract::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicHistoricalContractEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicHistoricalContractExcel> list = basicHistoricalContractService.exportBasicHistoricalContract(queryWrapper);
ExcelUtil.export(response, "客户历史合同记录数据" + DateUtil.time(), "客户历史合同记录数据表", list, BasicHistoricalContractExcel.class);
}
}

150
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStorageServicesController.java

@ -1,150 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicStorageServicesEntity;
import com.logpm.basicdata.vo.BasicStorageServicesVO;
import com.logpm.basicdata.excel.BasicStorageServicesExcel;
import com.logpm.basicdata.service.IBasicStorageServicesService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
/**
* 门店服务仓库表 控制器
*
* @author cyz
* @since 2023-05-15
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicStorageServices")
@Api(value = "门店服务仓库表", tags = "门店服务仓库表接口")
public class BasicStorageServicesController extends BladeController {
private final IBasicStorageServicesService basicStorageServicesService;
/**
* 门店服务仓库表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicStorageServices")
public R<BasicStorageServicesEntity> detail(BasicStorageServicesEntity basicStorageServices) {
BasicStorageServicesEntity detail = basicStorageServicesService.getOne(Condition.getQueryWrapper(basicStorageServices));
return R.data(detail);
}
/**
* 门店服务仓库表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicStorageServices")
public R<IPage<BasicStorageServicesEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicStorageServices, Query query) {
IPage<BasicStorageServicesEntity> pages = basicStorageServicesService.page(Condition.getPage(query), Condition.getQueryWrapper(basicStorageServices, BasicStorageServicesEntity.class));
return R.data(pages);
}
/**
* 门店服务仓库表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicStorageServices")
public R<IPage<BasicStorageServicesVO>> page(BasicStorageServicesVO basicStorageServices, Query query) {
IPage<BasicStorageServicesVO> pages = basicStorageServicesService.selectBasicStorageServicesPage(Condition.getPage(query), basicStorageServices);
return R.data(pages);
}
/**
* 门店服务仓库表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicStorageServices")
public R save(@Valid @RequestBody BasicStorageServicesEntity basicStorageServices) {
return R.status(basicStorageServicesService.save(basicStorageServices));
}
/**
* 门店服务仓库表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicStorageServices")
public R update(@Valid @RequestBody BasicStorageServicesEntity basicStorageServices) {
return R.status(basicStorageServicesService.updateById(basicStorageServices));
}
/**
* 门店服务仓库表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicStorageServices")
public R submit(@Valid @RequestBody BasicStorageServicesEntity basicStorageServices) {
return R.status(basicStorageServicesService.saveOrUpdate(basicStorageServices));
}
/**
* 门店服务仓库表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicStorageServicesService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicStorageServices")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicStorageServices")
public void exportBasicStorageServices(@ApiIgnore @RequestParam Map<String, Object> basicStorageServices, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicStorageServicesEntity> queryWrapper = Condition.getQueryWrapper(basicStorageServices, BasicStorageServicesEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicStorageServices::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicStorageServicesEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicStorageServicesExcel> list = basicStorageServicesService.exportBasicStorageServices(queryWrapper);
ExcelUtil.export(response, "门店服务仓库表数据" + DateUtil.time(), "门店服务仓库表数据表", list, BasicStorageServicesExcel.class);
}
}

75
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicBrandController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java

@ -31,10 +31,11 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicBrandEntity;
import com.logpm.basicdata.vo.BasicBrandVO;
import com.logpm.basicdata.excel.BasicBrandExcel;
import com.logpm.basicdata.service.IBasicBrandService;
import com.logpm.basicdata.entity.BasicdataBrandEntity;
import com.logpm.basicdata.vo.BasicdataBrandVO;
import com.logpm.basicdata.excel.BasicdataBrandExcel;
import com.logpm.basicdata.wrapper.BasicdataBrandWrapper;
import com.logpm.basicdata.service.IBasicdataBrandService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -48,35 +49,35 @@ import javax.servlet.http.HttpServletResponse;
* 基础品牌表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicBrand")
@RequestMapping("/basicdataBrand")
@Api(value = "基础品牌表", tags = "基础品牌表接口")
public class BasicBrandController extends BladeController {
public class BasicdataBrandController extends BladeController {
private final IBasicBrandService basicBrandService;
private final IBasicdataBrandService basicdataBrandService;
/**
* 基础品牌表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicBrand")
public R<BasicBrandEntity> detail(BasicBrandEntity basicBrand) {
BasicBrandEntity detail = basicBrandService.getOne(Condition.getQueryWrapper(basicBrand));
return R.data(detail);
@ApiOperation(value = "详情", notes = "传入basicdataBrand")
public R<BasicdataBrandVO> detail(BasicdataBrandEntity basicdataBrand) {
BasicdataBrandEntity detail = basicdataBrandService.getOne(Condition.getQueryWrapper(basicdataBrand));
return R.data(BasicdataBrandWrapper.build().entityVO(detail));
}
/**
* 基础品牌表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicBrand")
public R<IPage<BasicBrandEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicBrand, Query query) {
IPage<BasicBrandEntity> pages = basicBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicBrand, BasicBrandEntity.class));
return R.data(pages);
@ApiOperation(value = "分页", notes = "传入basicdataBrand")
public R<IPage<BasicdataBrandVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataBrand, Query query) {
IPage<BasicdataBrandEntity> pages = basicdataBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataBrand, BasicdataBrandEntity.class));
return R.data(BasicdataBrandWrapper.build().pageVO(pages));
}
/**
@ -84,9 +85,9 @@ public class BasicBrandController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicBrand")
public R<IPage<BasicBrandVO>> page(BasicBrandVO basicBrand, Query query) {
IPage<BasicBrandVO> pages = basicBrandService.selectBasicBrandPage(Condition.getPage(query), basicBrand);
@ApiOperation(value = "分页", notes = "传入basicdataBrand")
public R<IPage<BasicdataBrandVO>> page(BasicdataBrandVO basicdataBrand, Query query) {
IPage<BasicdataBrandVO> pages = basicdataBrandService.selectBasicdataBrandPage(Condition.getPage(query), basicdataBrand);
return R.data(pages);
}
@ -95,9 +96,9 @@ public class BasicBrandController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicBrand")
public R save(@Valid @RequestBody BasicBrandEntity basicBrand) {
return R.status(basicBrandService.save(basicBrand));
@ApiOperation(value = "新增", notes = "传入basicdataBrand")
public R save(@Valid @RequestBody BasicdataBrandEntity basicdataBrand) {
return R.status(basicdataBrandService.save(basicdataBrand));
}
/**
@ -105,9 +106,9 @@ public class BasicBrandController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicBrand")
public R update(@Valid @RequestBody BasicBrandEntity basicBrand) {
return R.status(basicBrandService.updateById(basicBrand));
@ApiOperation(value = "修改", notes = "传入basicdataBrand")
public R update(@Valid @RequestBody BasicdataBrandEntity basicdataBrand) {
return R.status(basicdataBrandService.updateById(basicdataBrand));
}
/**
@ -115,9 +116,9 @@ public class BasicBrandController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicBrand")
public R submit(@Valid @RequestBody BasicBrandEntity basicBrand) {
return R.status(basicBrandService.saveOrUpdate(basicBrand));
@ApiOperation(value = "新增或修改", notes = "传入basicdataBrand")
public R submit(@Valid @RequestBody BasicdataBrandEntity basicdataBrand) {
return R.status(basicdataBrandService.saveOrUpdate(basicdataBrand));
}
/**
@ -127,24 +128,24 @@ public class BasicBrandController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicBrandService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataBrandService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicBrand")
@GetMapping("/export-basicdataBrand")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicBrand")
public void exportBasicBrand(@ApiIgnore @RequestParam Map<String, Object> basicBrand, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicBrandEntity> queryWrapper = Condition.getQueryWrapper(basicBrand, BasicBrandEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataBrand")
public void exportBasicdataBrand(@ApiIgnore @RequestParam Map<String, Object> basicdataBrand, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataBrandEntity> queryWrapper = Condition.getQueryWrapper(basicdataBrand, BasicdataBrandEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicBrand::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataBrand::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicBrandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicBrandExcel> list = basicBrandService.exportBasicBrand(queryWrapper);
ExcelUtil.export(response, "基础品牌表数据" + DateUtil.time(), "基础品牌表数据表", list, BasicBrandExcel.class);
queryWrapper.lambda().eq(BasicdataBrandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataBrandExcel> list = basicdataBrandService.exportBasicdataBrand(queryWrapper);
ExcelUtil.export(response, "基础品牌表数据" + DateUtil.time(), "基础品牌表数据表", list, BasicdataBrandExcel.class);
}
}

70
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicClientController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@ -31,10 +31,10 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicClientEntity;
import com.logpm.basicdata.vo.BasicClientVO;
import com.logpm.basicdata.excel.BasicClientExcel;
import com.logpm.basicdata.service.IBasicClientService;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.vo.BasicdataClientVO;
import com.logpm.basicdata.excel.BasicdataClientExcel;
import com.logpm.basicdata.service.IBasicdataClientService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -48,24 +48,24 @@ import javax.servlet.http.HttpServletResponse;
* 基础客户表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicClient")
@RequestMapping("/basicdataClient")
@Api(value = "基础客户表", tags = "基础客户表接口")
public class BasicClientController extends BladeController {
public class BasicdataClientController extends BladeController {
private final IBasicClientService basicClientService;
private final IBasicdataClientService basicdataClientService;
/**
* 基础客户表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicClient")
public R<BasicClientEntity> detail(BasicClientEntity basicClient) {
BasicClientEntity detail = basicClientService.getOne(Condition.getQueryWrapper(basicClient));
@ApiOperation(value = "详情", notes = "传入basicdataClient")
public R<BasicdataClientEntity> detail(BasicdataClientEntity basicdataClient) {
BasicdataClientEntity detail = basicdataClientService.getOne(Condition.getQueryWrapper(basicdataClient));
return R.data(detail);
}
/**
@ -73,9 +73,9 @@ public class BasicClientController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicClient")
public R<IPage<BasicClientEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicClient, Query query) {
IPage<BasicClientEntity> pages = basicClientService.page(Condition.getPage(query), Condition.getQueryWrapper(basicClient, BasicClientEntity.class));
@ApiOperation(value = "分页", notes = "传入basicdataClient")
public R<IPage<BasicdataClientEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataClient, Query query) {
IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataClient, BasicdataClientEntity.class));
return R.data(pages);
}
@ -84,9 +84,9 @@ public class BasicClientController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicClient")
public R<IPage<BasicClientVO>> page(BasicClientVO basicClient, Query query) {
IPage<BasicClientVO> pages = basicClientService.selectBasicClientPage(Condition.getPage(query), basicClient);
@ApiOperation(value = "分页", notes = "传入basicdataClient")
public R<IPage<BasicdataClientVO>> page(BasicdataClientVO basicdataClient, Query query) {
IPage<BasicdataClientVO> pages = basicdataClientService.selectBasicdataClientPage(Condition.getPage(query), basicdataClient);
return R.data(pages);
}
@ -95,9 +95,9 @@ public class BasicClientController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicClient")
public R save(@Valid @RequestBody BasicClientEntity basicClient) {
return R.status(basicClientService.save(basicClient));
@ApiOperation(value = "新增", notes = "传入basicdataClient")
public R save(@Valid @RequestBody BasicdataClientEntity basicdataClient) {
return R.status(basicdataClientService.save(basicdataClient));
}
/**
@ -105,9 +105,9 @@ public class BasicClientController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicClient")
public R update(@Valid @RequestBody BasicClientEntity basicClient) {
return R.status(basicClientService.updateById(basicClient));
@ApiOperation(value = "修改", notes = "传入basicdataClient")
public R update(@Valid @RequestBody BasicdataClientEntity basicdataClient) {
return R.status(basicdataClientService.updateById(basicdataClient));
}
/**
@ -115,9 +115,9 @@ public class BasicClientController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicClient")
public R submit(@Valid @RequestBody BasicClientEntity basicClient) {
return R.status(basicClientService.saveOrUpdate(basicClient));
@ApiOperation(value = "新增或修改", notes = "传入basicdataClient")
public R submit(@Valid @RequestBody BasicdataClientEntity basicdataClient) {
return R.status(basicdataClientService.saveOrUpdate(basicdataClient));
}
/**
@ -127,24 +127,24 @@ public class BasicClientController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicClientService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataClientService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicClient")
@GetMapping("/export-basicdataClient")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicClient")
public void exportBasicClient(@ApiIgnore @RequestParam Map<String, Object> basicClient, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicClientEntity> queryWrapper = Condition.getQueryWrapper(basicClient, BasicClientEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataClient")
public void exportBasicdataClient(@ApiIgnore @RequestParam Map<String, Object> basicdataClient, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataClientEntity> queryWrapper = Condition.getQueryWrapper(basicdataClient, BasicdataClientEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicClient::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataClient::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicClientEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicClientExcel> list = basicClientService.exportBasicClient(queryWrapper);
ExcelUtil.export(response, "基础客户表数据" + DateUtil.time(), "基础客户表数据表", list, BasicClientExcel.class);
queryWrapper.lambda().eq(BasicdataClientEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataClientExcel> list = basicdataClientService.exportBasicdataClient(queryWrapper);
ExcelUtil.export(response, "基础客户表数据" + DateUtil.time(), "基础客户表数据表", list, BasicdataClientExcel.class);
}
}

70
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicFreightController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java

@ -31,10 +31,10 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicFreightEntity;
import com.logpm.basicdata.vo.BasicFreightVO;
import com.logpm.basicdata.excel.BasicFreightExcel;
import com.logpm.basicdata.service.IBasicFreightService;
import com.logpm.basicdata.entity.BasicdataFreightEntity;
import com.logpm.basicdata.vo.BasicdataFreightVO;
import com.logpm.basicdata.excel.BasicdataFreightExcel;
import com.logpm.basicdata.service.IBasicdataFreightService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -48,24 +48,24 @@ import javax.servlet.http.HttpServletResponse;
* 基础价格记录表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicFreight")
@RequestMapping("/basicdataFreight")
@Api(value = "基础价格记录表", tags = "基础价格记录表接口")
public class BasicFreightController extends BladeController {
public class BasicdataFreightController extends BladeController {
private final IBasicFreightService basicFreightService;
private final IBasicdataFreightService basicdataFreightService;
/**
* 基础价格记录表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicFreight")
public R<BasicFreightEntity> detail(BasicFreightEntity basicFreight) {
BasicFreightEntity detail = basicFreightService.getOne(Condition.getQueryWrapper(basicFreight));
@ApiOperation(value = "详情", notes = "传入basicdataFreight")
public R<BasicdataFreightEntity> detail(BasicdataFreightEntity basicdataFreight) {
BasicdataFreightEntity detail = basicdataFreightService.getOne(Condition.getQueryWrapper(basicdataFreight));
return R.data(detail);
}
/**
@ -73,9 +73,9 @@ public class BasicFreightController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicFreight")
public R<IPage<BasicFreightEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicFreight, Query query) {
IPage<BasicFreightEntity> pages = basicFreightService.page(Condition.getPage(query), Condition.getQueryWrapper(basicFreight, BasicFreightEntity.class));
@ApiOperation(value = "分页", notes = "传入basicdataFreight")
public R<IPage<BasicdataFreightEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataFreight, Query query) {
IPage<BasicdataFreightEntity> pages = basicdataFreightService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataFreight, BasicdataFreightEntity.class));
return R.data(pages);
}
@ -84,9 +84,9 @@ public class BasicFreightController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicFreight")
public R<IPage<BasicFreightVO>> page(BasicFreightVO basicFreight, Query query) {
IPage<BasicFreightVO> pages = basicFreightService.selectBasicFreightPage(Condition.getPage(query), basicFreight);
@ApiOperation(value = "分页", notes = "传入basicdataFreight")
public R<IPage<BasicdataFreightVO>> page(BasicdataFreightVO basicdataFreight, Query query) {
IPage<BasicdataFreightVO> pages = basicdataFreightService.selectBasicdataFreightPage(Condition.getPage(query), basicdataFreight);
return R.data(pages);
}
@ -95,9 +95,9 @@ public class BasicFreightController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicFreight")
public R save(@Valid @RequestBody BasicFreightEntity basicFreight) {
return R.status(basicFreightService.save(basicFreight));
@ApiOperation(value = "新增", notes = "传入basicdataFreight")
public R save(@Valid @RequestBody BasicdataFreightEntity basicdataFreight) {
return R.status(basicdataFreightService.save(basicdataFreight));
}
/**
@ -105,9 +105,9 @@ public class BasicFreightController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicFreight")
public R update(@Valid @RequestBody BasicFreightEntity basicFreight) {
return R.status(basicFreightService.updateById(basicFreight));
@ApiOperation(value = "修改", notes = "传入basicdataFreight")
public R update(@Valid @RequestBody BasicdataFreightEntity basicdataFreight) {
return R.status(basicdataFreightService.updateById(basicdataFreight));
}
/**
@ -115,9 +115,9 @@ public class BasicFreightController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicFreight")
public R submit(@Valid @RequestBody BasicFreightEntity basicFreight) {
return R.status(basicFreightService.saveOrUpdate(basicFreight));
@ApiOperation(value = "新增或修改", notes = "传入basicdataFreight")
public R submit(@Valid @RequestBody BasicdataFreightEntity basicdataFreight) {
return R.status(basicdataFreightService.saveOrUpdate(basicdataFreight));
}
/**
@ -127,24 +127,24 @@ public class BasicFreightController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicFreightService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataFreightService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicFreight")
@GetMapping("/export-basicdataFreight")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicFreight")
public void exportBasicFreight(@ApiIgnore @RequestParam Map<String, Object> basicFreight, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicFreightEntity> queryWrapper = Condition.getQueryWrapper(basicFreight, BasicFreightEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataFreight")
public void exportBasicdataFreight(@ApiIgnore @RequestParam Map<String, Object> basicdataFreight, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataFreightEntity> queryWrapper = Condition.getQueryWrapper(basicdataFreight, BasicdataFreightEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicFreight::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataFreight::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicFreightEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicFreightExcel> list = basicFreightService.exportBasicFreight(queryWrapper);
ExcelUtil.export(response, "基础价格记录表数据" + DateUtil.time(), "基础价格记录表数据表", list, BasicFreightExcel.class);
queryWrapper.lambda().eq(BasicdataFreightEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataFreightExcel> list = basicdataFreightService.exportBasicdataFreight(queryWrapper);
ExcelUtil.export(response, "基础价格记录表数据" + DateUtil.time(), "基础价格记录表数据表", list, BasicdataFreightExcel.class);
}
}

150
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataHistoricalContractController.java

@ -0,0 +1,150 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
import com.logpm.basicdata.vo.BasicdataHistoricalContractVO;
import com.logpm.basicdata.excel.BasicdataHistoricalContractExcel;
import com.logpm.basicdata.service.IBasicdataHistoricalContractService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
/**
* 客户历史合同记录 控制器
*
* @author cyz
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicdataHistoricalContract")
@Api(value = "客户历史合同记录", tags = "客户历史合同记录接口")
public class BasicdataHistoricalContractController extends BladeController {
private final IBasicdataHistoricalContractService basicdataHistoricalContractService;
/**
* 客户历史合同记录 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicdataHistoricalContract")
public R<BasicdataHistoricalContractEntity> detail(BasicdataHistoricalContractEntity basicdataHistoricalContract) {
BasicdataHistoricalContractEntity detail = basicdataHistoricalContractService.getOne(Condition.getQueryWrapper(basicdataHistoricalContract));
return R.data(detail);
}
/**
* 客户历史合同记录 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicdataHistoricalContract")
public R<IPage<BasicdataHistoricalContractEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataHistoricalContract, Query query) {
IPage<BasicdataHistoricalContractEntity> pages = basicdataHistoricalContractService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataHistoricalContract, BasicdataHistoricalContractEntity.class));
return R.data(pages);
}
/**
* 客户历史合同记录 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicdataHistoricalContract")
public R<IPage<BasicdataHistoricalContractVO>> page(BasicdataHistoricalContractVO basicdataHistoricalContract, Query query) {
IPage<BasicdataHistoricalContractVO> pages = basicdataHistoricalContractService.selectBasicdataHistoricalContractPage(Condition.getPage(query), basicdataHistoricalContract);
return R.data(pages);
}
/**
* 客户历史合同记录 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicdataHistoricalContract")
public R save(@Valid @RequestBody BasicdataHistoricalContractEntity basicdataHistoricalContract) {
return R.status(basicdataHistoricalContractService.save(basicdataHistoricalContract));
}
/**
* 客户历史合同记录 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicdataHistoricalContract")
public R update(@Valid @RequestBody BasicdataHistoricalContractEntity basicdataHistoricalContract) {
return R.status(basicdataHistoricalContractService.updateById(basicdataHistoricalContract));
}
/**
* 客户历史合同记录 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicdataHistoricalContract")
public R submit(@Valid @RequestBody BasicdataHistoricalContractEntity basicdataHistoricalContract) {
return R.status(basicdataHistoricalContractService.saveOrUpdate(basicdataHistoricalContract));
}
/**
* 客户历史合同记录 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicdataHistoricalContractService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicdataHistoricalContract")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicdataHistoricalContract")
public void exportBasicdataHistoricalContract(@ApiIgnore @RequestParam Map<String, Object> basicdataHistoricalContract, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataHistoricalContractEntity> queryWrapper = Condition.getQueryWrapper(basicdataHistoricalContract, BasicdataHistoricalContractEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicdataHistoricalContract::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicdataHistoricalContractEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataHistoricalContractExcel> list = basicdataHistoricalContractService.exportBasicdataHistoricalContract(queryWrapper);
ExcelUtil.export(response, "客户历史合同记录数据" + DateUtil.time(), "客户历史合同记录数据表", list, BasicdataHistoricalContractExcel.class);
}
}

70
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicShopController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java

@ -31,10 +31,10 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicShopEntity;
import com.logpm.basicdata.vo.BasicShopVO;
import com.logpm.basicdata.excel.BasicShopExcel;
import com.logpm.basicdata.service.IBasicShopService;
import com.logpm.basicdata.entity.BasicdataShopEntity;
import com.logpm.basicdata.vo.BasicdataShopVO;
import com.logpm.basicdata.excel.BasicdataShopExcel;
import com.logpm.basicdata.service.IBasicdataShopService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -48,24 +48,24 @@ import javax.servlet.http.HttpServletResponse;
* 基础门店表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicShop")
@RequestMapping("/basicdataShop")
@Api(value = "基础门店表", tags = "基础门店表接口")
public class BasicShopController extends BladeController {
public class BasicdataShopController extends BladeController {
private final IBasicShopService basicShopService;
private final IBasicdataShopService basicdataShopService;
/**
* 基础门店表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicShop")
public R<BasicShopEntity> detail(BasicShopEntity basicShop) {
BasicShopEntity detail = basicShopService.getOne(Condition.getQueryWrapper(basicShop));
@ApiOperation(value = "详情", notes = "传入basicdataShop")
public R<BasicdataShopEntity> detail(BasicdataShopEntity basicdataShop) {
BasicdataShopEntity detail = basicdataShopService.getOne(Condition.getQueryWrapper(basicdataShop));
return R.data(detail);
}
/**
@ -73,9 +73,9 @@ public class BasicShopController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicShop")
public R<IPage<BasicShopEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicShop, Query query) {
IPage<BasicShopEntity> pages = basicShopService.page(Condition.getPage(query), Condition.getQueryWrapper(basicShop, BasicShopEntity.class));
@ApiOperation(value = "分页", notes = "传入basicdataShop")
public R<IPage<BasicdataShopEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataShop, Query query) {
IPage<BasicdataShopEntity> pages = basicdataShopService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataShop, BasicdataShopEntity.class));
return R.data(pages);
}
@ -84,9 +84,9 @@ public class BasicShopController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicShop")
public R<IPage<BasicShopVO>> page(BasicShopVO basicShop, Query query) {
IPage<BasicShopVO> pages = basicShopService.selectBasicShopPage(Condition.getPage(query), basicShop);
@ApiOperation(value = "分页", notes = "传入basicdataShop")
public R<IPage<BasicdataShopVO>> page(BasicdataShopVO basicdataShop, Query query) {
IPage<BasicdataShopVO> pages = basicdataShopService.selectBasicdataShopPage(Condition.getPage(query), basicdataShop);
return R.data(pages);
}
@ -95,9 +95,9 @@ public class BasicShopController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicShop")
public R save(@Valid @RequestBody BasicShopEntity basicShop) {
return R.status(basicShopService.save(basicShop));
@ApiOperation(value = "新增", notes = "传入basicdataShop")
public R save(@Valid @RequestBody BasicdataShopEntity basicdataShop) {
return R.status(basicdataShopService.save(basicdataShop));
}
/**
@ -105,9 +105,9 @@ public class BasicShopController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicShop")
public R update(@Valid @RequestBody BasicShopEntity basicShop) {
return R.status(basicShopService.updateById(basicShop));
@ApiOperation(value = "修改", notes = "传入basicdataShop")
public R update(@Valid @RequestBody BasicdataShopEntity basicdataShop) {
return R.status(basicdataShopService.updateById(basicdataShop));
}
/**
@ -115,9 +115,9 @@ public class BasicShopController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicShop")
public R submit(@Valid @RequestBody BasicShopEntity basicShop) {
return R.status(basicShopService.saveOrUpdate(basicShop));
@ApiOperation(value = "新增或修改", notes = "传入basicdataShop")
public R submit(@Valid @RequestBody BasicdataShopEntity basicdataShop) {
return R.status(basicdataShopService.saveOrUpdate(basicdataShop));
}
/**
@ -127,24 +127,24 @@ public class BasicShopController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicShopService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataShopService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicShop")
@GetMapping("/export-basicdataShop")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicShop")
public void exportBasicShop(@ApiIgnore @RequestParam Map<String, Object> basicShop, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicShopEntity> queryWrapper = Condition.getQueryWrapper(basicShop, BasicShopEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataShop")
public void exportBasicdataShop(@ApiIgnore @RequestParam Map<String, Object> basicdataShop, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataShopEntity> queryWrapper = Condition.getQueryWrapper(basicdataShop, BasicdataShopEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicShop::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataShop::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicShopEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicShopExcel> list = basicShopService.exportBasicShop(queryWrapper);
ExcelUtil.export(response, "基础门店表数据" + DateUtil.time(), "基础门店表数据表", list, BasicShopExcel.class);
queryWrapper.lambda().eq(BasicdataShopEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataShopExcel> list = basicdataShopService.exportBasicdataShop(queryWrapper);
ExcelUtil.export(response, "基础门店表数据" + DateUtil.time(), "基础门店表数据表", list, BasicdataShopExcel.class);
}
}

150
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java

@ -0,0 +1,150 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
import com.logpm.basicdata.vo.BasicdataStorageServicesVO;
import com.logpm.basicdata.excel.BasicdataStorageServicesExcel;
import com.logpm.basicdata.service.IBasicdataStorageServicesService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
/**
* 门店服务仓库表 控制器
*
* @author cyz
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicdataStorageServices")
@Api(value = "门店服务仓库表", tags = "门店服务仓库表接口")
public class BasicdataStorageServicesController extends BladeController {
private final IBasicdataStorageServicesService basicdataStorageServicesService;
/**
* 门店服务仓库表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicdataStorageServices")
public R<BasicdataStorageServicesEntity> detail(BasicdataStorageServicesEntity basicdataStorageServices) {
BasicdataStorageServicesEntity detail = basicdataStorageServicesService.getOne(Condition.getQueryWrapper(basicdataStorageServices));
return R.data(detail);
}
/**
* 门店服务仓库表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicdataStorageServices")
public R<IPage<BasicdataStorageServicesEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStorageServices, Query query) {
IPage<BasicdataStorageServicesEntity> pages = basicdataStorageServicesService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStorageServices, BasicdataStorageServicesEntity.class));
return R.data(pages);
}
/**
* 门店服务仓库表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicdataStorageServices")
public R<IPage<BasicdataStorageServicesVO>> page(BasicdataStorageServicesVO basicdataStorageServices, Query query) {
IPage<BasicdataStorageServicesVO> pages = basicdataStorageServicesService.selectBasicdataStorageServicesPage(Condition.getPage(query), basicdataStorageServices);
return R.data(pages);
}
/**
* 门店服务仓库表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicdataStorageServices")
public R save(@Valid @RequestBody BasicdataStorageServicesEntity basicdataStorageServices) {
return R.status(basicdataStorageServicesService.save(basicdataStorageServices));
}
/**
* 门店服务仓库表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicdataStorageServices")
public R update(@Valid @RequestBody BasicdataStorageServicesEntity basicdataStorageServices) {
return R.status(basicdataStorageServicesService.updateById(basicdataStorageServices));
}
/**
* 门店服务仓库表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicdataStorageServices")
public R submit(@Valid @RequestBody BasicdataStorageServicesEntity basicdataStorageServices) {
return R.status(basicdataStorageServicesService.saveOrUpdate(basicdataStorageServices));
}
/**
* 门店服务仓库表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicdataStorageServicesService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicdataStorageServices")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicdataStorageServices")
public void exportBasicdataStorageServices(@ApiIgnore @RequestParam Map<String, Object> basicdataStorageServices, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataStorageServicesEntity> queryWrapper = Condition.getQueryWrapper(basicdataStorageServices, BasicdataStorageServicesEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicdataStorageServices::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicdataStorageServicesEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataStorageServicesExcel> list = basicdataStorageServicesService.exportBasicdataStorageServices(queryWrapper);
ExcelUtil.export(response, "门店服务仓库表数据" + DateUtil.time(), "门店服务仓库表数据表", list, BasicdataStorageServicesExcel.class);
}
}

75
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStoreBrandController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java

@ -31,11 +31,10 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicStoreBrandEntity;
import com.logpm.basicdata.vo.BasicStoreBrandVO;
import com.logpm.basicdata.excel.BasicStoreBrandExcel;
import com.logpm.basicdata.wrapper.BasicStoreBrandWrapper;
import com.logpm.basicdata.service.IBasicStoreBrandService;
import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
import com.logpm.basicdata.vo.BasicdataStoreBrandVO;
import com.logpm.basicdata.excel.BasicdataStoreBrandExcel;
import com.logpm.basicdata.service.IBasicdataStoreBrandService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -49,35 +48,35 @@ import javax.servlet.http.HttpServletResponse;
* 门店品牌中间表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicStoreBrand")
@RequestMapping("/basicdataStoreBrand")
@Api(value = "门店品牌中间表", tags = "门店品牌中间表接口")
public class BasicStoreBrandController extends BladeController {
public class BasicdataStoreBrandController extends BladeController {
private final IBasicStoreBrandService basicStoreBrandService;
private final IBasicdataStoreBrandService basicdataStoreBrandService;
/**
* 门店品牌中间表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicStoreBrand")
public R<BasicStoreBrandVO> detail(BasicStoreBrandEntity basicStoreBrand) {
BasicStoreBrandEntity detail = basicStoreBrandService.getOne(Condition.getQueryWrapper(basicStoreBrand));
return R.data(BasicStoreBrandWrapper.build().entityVO(detail));
@ApiOperation(value = "详情", notes = "传入basicdataStoreBrand")
public R<BasicdataStoreBrandEntity> detail(BasicdataStoreBrandEntity basicdataStoreBrand) {
BasicdataStoreBrandEntity detail = basicdataStoreBrandService.getOne(Condition.getQueryWrapper(basicdataStoreBrand));
return R.data(detail);
}
/**
* 门店品牌中间表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicStoreBrand")
public R<IPage<BasicStoreBrandVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicStoreBrand, Query query) {
IPage<BasicStoreBrandEntity> pages = basicStoreBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicStoreBrand, BasicStoreBrandEntity.class));
return R.data(BasicStoreBrandWrapper.build().pageVO(pages));
@ApiOperation(value = "分页", notes = "传入basicdataStoreBrand")
public R<IPage<BasicdataStoreBrandEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreBrand, Query query) {
IPage<BasicdataStoreBrandEntity> pages = basicdataStoreBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreBrand, BasicdataStoreBrandEntity.class));
return R.data(pages);
}
/**
@ -85,9 +84,9 @@ public class BasicStoreBrandController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicStoreBrand")
public R<IPage<BasicStoreBrandVO>> page(BasicStoreBrandVO basicStoreBrand, Query query) {
IPage<BasicStoreBrandVO> pages = basicStoreBrandService.selectBasicStoreBrandPage(Condition.getPage(query), basicStoreBrand);
@ApiOperation(value = "分页", notes = "传入basicdataStoreBrand")
public R<IPage<BasicdataStoreBrandVO>> page(BasicdataStoreBrandVO basicdataStoreBrand, Query query) {
IPage<BasicdataStoreBrandVO> pages = basicdataStoreBrandService.selectBasicdataStoreBrandPage(Condition.getPage(query), basicdataStoreBrand);
return R.data(pages);
}
@ -96,9 +95,9 @@ public class BasicStoreBrandController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicStoreBrand")
public R save(@Valid @RequestBody BasicStoreBrandEntity basicStoreBrand) {
return R.status(basicStoreBrandService.save(basicStoreBrand));
@ApiOperation(value = "新增", notes = "传入basicdataStoreBrand")
public R save(@Valid @RequestBody BasicdataStoreBrandEntity basicdataStoreBrand) {
return R.status(basicdataStoreBrandService.save(basicdataStoreBrand));
}
/**
@ -106,9 +105,9 @@ public class BasicStoreBrandController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicStoreBrand")
public R update(@Valid @RequestBody BasicStoreBrandEntity basicStoreBrand) {
return R.status(basicStoreBrandService.updateById(basicStoreBrand));
@ApiOperation(value = "修改", notes = "传入basicdataStoreBrand")
public R update(@Valid @RequestBody BasicdataStoreBrandEntity basicdataStoreBrand) {
return R.status(basicdataStoreBrandService.updateById(basicdataStoreBrand));
}
/**
@ -116,9 +115,9 @@ public class BasicStoreBrandController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicStoreBrand")
public R submit(@Valid @RequestBody BasicStoreBrandEntity basicStoreBrand) {
return R.status(basicStoreBrandService.saveOrUpdate(basicStoreBrand));
@ApiOperation(value = "新增或修改", notes = "传入basicdataStoreBrand")
public R submit(@Valid @RequestBody BasicdataStoreBrandEntity basicdataStoreBrand) {
return R.status(basicdataStoreBrandService.saveOrUpdate(basicdataStoreBrand));
}
/**
@ -128,24 +127,24 @@ public class BasicStoreBrandController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicStoreBrandService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataStoreBrandService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicStoreBrand")
@GetMapping("/export-basicdataStoreBrand")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicStoreBrand")
public void exportBasicStoreBrand(@ApiIgnore @RequestParam Map<String, Object> basicStoreBrand, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicStoreBrandEntity> queryWrapper = Condition.getQueryWrapper(basicStoreBrand, BasicStoreBrandEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataStoreBrand")
public void exportBasicdataStoreBrand(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreBrand, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataStoreBrandEntity> queryWrapper = Condition.getQueryWrapper(basicdataStoreBrand, BasicdataStoreBrandEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicStoreBrand::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataStoreBrand::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicStoreBrandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicStoreBrandExcel> list = basicStoreBrandService.exportBasicStoreBrand(queryWrapper);
ExcelUtil.export(response, "门店品牌中间表数据" + DateUtil.time(), "门店品牌中间表数据表", list, BasicStoreBrandExcel.class);
queryWrapper.lambda().eq(BasicdataStoreBrandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataStoreBrandExcel> list = basicdataStoreBrandService.exportBasicdataStoreBrand(queryWrapper);
ExcelUtil.export(response, "门店品牌中间表数据" + DateUtil.time(), "门店品牌中间表数据表", list, BasicdataStoreBrandExcel.class);
}
}

70
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStoreContactController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreContactController.java

@ -31,10 +31,10 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicStoreContactEntity;
import com.logpm.basicdata.vo.BasicStoreContactVO;
import com.logpm.basicdata.excel.BasicStoreContactExcel;
import com.logpm.basicdata.service.IBasicStoreContactService;
import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
import com.logpm.basicdata.vo.BasicdataStoreContactVO;
import com.logpm.basicdata.excel.BasicdataStoreContactExcel;
import com.logpm.basicdata.service.IBasicdataStoreContactService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -48,24 +48,24 @@ import javax.servlet.http.HttpServletResponse;
* 基础门店联系人表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicStoreContact")
@RequestMapping("/basicdataStoreContact")
@Api(value = "基础门店联系人表", tags = "基础门店联系人表接口")
public class BasicStoreContactController extends BladeController {
public class BasicdataStoreContactController extends BladeController {
private final IBasicStoreContactService basicStoreContactService;
private final IBasicdataStoreContactService basicdataStoreContactService;
/**
* 基础门店联系人表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicStoreContact")
public R<BasicStoreContactEntity> detail(BasicStoreContactEntity basicStoreContact) {
BasicStoreContactEntity detail = basicStoreContactService.getOne(Condition.getQueryWrapper(basicStoreContact));
@ApiOperation(value = "详情", notes = "传入basicdataStoreContact")
public R<BasicdataStoreContactEntity> detail(BasicdataStoreContactEntity basicdataStoreContact) {
BasicdataStoreContactEntity detail = basicdataStoreContactService.getOne(Condition.getQueryWrapper(basicdataStoreContact));
return R.data(detail);
}
/**
@ -73,9 +73,9 @@ public class BasicStoreContactController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicStoreContact")
public R<IPage<BasicStoreContactEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicStoreContact, Query query) {
IPage<BasicStoreContactEntity> pages = basicStoreContactService.page(Condition.getPage(query), Condition.getQueryWrapper(basicStoreContact, BasicStoreContactEntity.class));
@ApiOperation(value = "分页", notes = "传入basicdataStoreContact")
public R<IPage<BasicdataStoreContactEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreContact, Query query) {
IPage<BasicdataStoreContactEntity> pages = basicdataStoreContactService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreContact, BasicdataStoreContactEntity.class));
return R.data(pages);
}
@ -84,9 +84,9 @@ public class BasicStoreContactController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicStoreContact")
public R<IPage<BasicStoreContactVO>> page(BasicStoreContactVO basicStoreContact, Query query) {
IPage<BasicStoreContactVO> pages = basicStoreContactService.selectBasicStoreContactPage(Condition.getPage(query), basicStoreContact);
@ApiOperation(value = "分页", notes = "传入basicdataStoreContact")
public R<IPage<BasicdataStoreContactVO>> page(BasicdataStoreContactVO basicdataStoreContact, Query query) {
IPage<BasicdataStoreContactVO> pages = basicdataStoreContactService.selectBasicdataStoreContactPage(Condition.getPage(query), basicdataStoreContact);
return R.data(pages);
}
@ -95,9 +95,9 @@ public class BasicStoreContactController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicStoreContact")
public R save(@Valid @RequestBody BasicStoreContactEntity basicStoreContact) {
return R.status(basicStoreContactService.save(basicStoreContact));
@ApiOperation(value = "新增", notes = "传入basicdataStoreContact")
public R save(@Valid @RequestBody BasicdataStoreContactEntity basicdataStoreContact) {
return R.status(basicdataStoreContactService.save(basicdataStoreContact));
}
/**
@ -105,9 +105,9 @@ public class BasicStoreContactController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicStoreContact")
public R update(@Valid @RequestBody BasicStoreContactEntity basicStoreContact) {
return R.status(basicStoreContactService.updateById(basicStoreContact));
@ApiOperation(value = "修改", notes = "传入basicdataStoreContact")
public R update(@Valid @RequestBody BasicdataStoreContactEntity basicdataStoreContact) {
return R.status(basicdataStoreContactService.updateById(basicdataStoreContact));
}
/**
@ -115,9 +115,9 @@ public class BasicStoreContactController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicStoreContact")
public R submit(@Valid @RequestBody BasicStoreContactEntity basicStoreContact) {
return R.status(basicStoreContactService.saveOrUpdate(basicStoreContact));
@ApiOperation(value = "新增或修改", notes = "传入basicdataStoreContact")
public R submit(@Valid @RequestBody BasicdataStoreContactEntity basicdataStoreContact) {
return R.status(basicdataStoreContactService.saveOrUpdate(basicdataStoreContact));
}
/**
@ -127,24 +127,24 @@ public class BasicStoreContactController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicStoreContactService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataStoreContactService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicStoreContact")
@GetMapping("/export-basicdataStoreContact")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicStoreContact")
public void exportBasicStoreContact(@ApiIgnore @RequestParam Map<String, Object> basicStoreContact, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicStoreContactEntity> queryWrapper = Condition.getQueryWrapper(basicStoreContact, BasicStoreContactEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataStoreContact")
public void exportBasicdataStoreContact(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreContact, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataStoreContactEntity> queryWrapper = Condition.getQueryWrapper(basicdataStoreContact, BasicdataStoreContactEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicStoreContact::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataStoreContact::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicStoreContactEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicStoreContactExcel> list = basicStoreContactService.exportBasicStoreContact(queryWrapper);
ExcelUtil.export(response, "基础门店联系人表数据" + DateUtil.time(), "基础门店联系人表数据表", list, BasicStoreContactExcel.class);
queryWrapper.lambda().eq(BasicdataStoreContactEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataStoreContactExcel> list = basicdataStoreContactService.exportBasicdataStoreContact(queryWrapper);
ExcelUtil.export(response, "基础门店联系人表数据" + DateUtil.time(), "基础门店联系人表数据表", list, BasicdataStoreContactExcel.class);
}
}

70
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicZonePriceController.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java

@ -31,10 +31,10 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.entity.BasicZonePriceEntity;
import com.logpm.basicdata.vo.BasicZonePriceVO;
import com.logpm.basicdata.excel.BasicZonePriceExcel;
import com.logpm.basicdata.service.IBasicZonePriceService;
import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
import com.logpm.basicdata.vo.BasicdataZonePriceVO;
import com.logpm.basicdata.excel.BasicdataZonePriceExcel;
import com.logpm.basicdata.service.IBasicdataZonePriceService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@ -48,24 +48,24 @@ import javax.servlet.http.HttpServletResponse;
* 区域品牌价格表 控制器
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@RestController
@AllArgsConstructor
@RequestMapping("/basicZonePrice")
@RequestMapping("/basicdataZonePrice")
@Api(value = "区域品牌价格表", tags = "区域品牌价格表接口")
public class BasicZonePriceController extends BladeController {
public class BasicdataZonePriceController extends BladeController {
private final IBasicZonePriceService basicZonePriceService;
private final IBasicdataZonePriceService basicdataZonePriceService;
/**
* 区域品牌价格表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入basicZonePrice")
public R<BasicZonePriceEntity> detail(BasicZonePriceEntity basicZonePrice) {
BasicZonePriceEntity detail = basicZonePriceService.getOne(Condition.getQueryWrapper(basicZonePrice));
@ApiOperation(value = "详情", notes = "传入basicdataZonePrice")
public R<BasicdataZonePriceEntity> detail(BasicdataZonePriceEntity basicdataZonePrice) {
BasicdataZonePriceEntity detail = basicdataZonePriceService.getOne(Condition.getQueryWrapper(basicdataZonePrice));
return R.data(detail);
}
/**
@ -73,9 +73,9 @@ public class BasicZonePriceController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入basicZonePrice")
public R<IPage<BasicZonePriceEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicZonePrice, Query query) {
IPage<BasicZonePriceEntity> pages = basicZonePriceService.page(Condition.getPage(query), Condition.getQueryWrapper(basicZonePrice, BasicZonePriceEntity.class));
@ApiOperation(value = "分页", notes = "传入basicdataZonePrice")
public R<IPage<BasicdataZonePriceEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataZonePrice, Query query) {
IPage<BasicdataZonePriceEntity> pages = basicdataZonePriceService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataZonePrice, BasicdataZonePriceEntity.class));
return R.data(pages);
}
@ -84,9 +84,9 @@ public class BasicZonePriceController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入basicZonePrice")
public R<IPage<BasicZonePriceVO>> page(BasicZonePriceVO basicZonePrice, Query query) {
IPage<BasicZonePriceVO> pages = basicZonePriceService.selectBasicZonePricePage(Condition.getPage(query), basicZonePrice);
@ApiOperation(value = "分页", notes = "传入basicdataZonePrice")
public R<IPage<BasicdataZonePriceVO>> page(BasicdataZonePriceVO basicdataZonePrice, Query query) {
IPage<BasicdataZonePriceVO> pages = basicdataZonePriceService.selectBasicdataZonePricePage(Condition.getPage(query), basicdataZonePrice);
return R.data(pages);
}
@ -95,9 +95,9 @@ public class BasicZonePriceController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicZonePrice")
public R save(@Valid @RequestBody BasicZonePriceEntity basicZonePrice) {
return R.status(basicZonePriceService.save(basicZonePrice));
@ApiOperation(value = "新增", notes = "传入basicdataZonePrice")
public R save(@Valid @RequestBody BasicdataZonePriceEntity basicdataZonePrice) {
return R.status(basicdataZonePriceService.save(basicdataZonePrice));
}
/**
@ -105,9 +105,9 @@ public class BasicZonePriceController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入basicZonePrice")
public R update(@Valid @RequestBody BasicZonePriceEntity basicZonePrice) {
return R.status(basicZonePriceService.updateById(basicZonePrice));
@ApiOperation(value = "修改", notes = "传入basicdataZonePrice")
public R update(@Valid @RequestBody BasicdataZonePriceEntity basicdataZonePrice) {
return R.status(basicdataZonePriceService.updateById(basicdataZonePrice));
}
/**
@ -115,9 +115,9 @@ public class BasicZonePriceController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入basicZonePrice")
public R submit(@Valid @RequestBody BasicZonePriceEntity basicZonePrice) {
return R.status(basicZonePriceService.saveOrUpdate(basicZonePrice));
@ApiOperation(value = "新增或修改", notes = "传入basicdataZonePrice")
public R submit(@Valid @RequestBody BasicdataZonePriceEntity basicdataZonePrice) {
return R.status(basicdataZonePriceService.saveOrUpdate(basicdataZonePrice));
}
/**
@ -127,24 +127,24 @@ public class BasicZonePriceController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(basicZonePriceService.deleteLogic(Func.toLongList(ids)));
return R.status(basicdataZonePriceService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@GetMapping("/export-basicZonePrice")
@GetMapping("/export-basicdataZonePrice")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入basicZonePrice")
public void exportBasicZonePrice(@ApiIgnore @RequestParam Map<String, Object> basicZonePrice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicZonePriceEntity> queryWrapper = Condition.getQueryWrapper(basicZonePrice, BasicZonePriceEntity.class);
@ApiOperation(value = "导出数据", notes = "传入basicdataZonePrice")
public void exportBasicdataZonePrice(@ApiIgnore @RequestParam Map<String, Object> basicdataZonePrice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<BasicdataZonePriceEntity> queryWrapper = Condition.getQueryWrapper(basicdataZonePrice, BasicdataZonePriceEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(BasicZonePrice::getTenantId, bladeUser.getTenantId());
// queryWrapper.lambda().eq(BasicdataZonePrice::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(BasicZonePriceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicZonePriceExcel> list = basicZonePriceService.exportBasicZonePrice(queryWrapper);
ExcelUtil.export(response, "区域品牌价格表数据" + DateUtil.time(), "区域品牌价格表数据表", list, BasicZonePriceExcel.class);
queryWrapper.lambda().eq(BasicdataZonePriceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<BasicdataZonePriceExcel> list = basicdataZonePriceService.exportBasicdataZonePrice(queryWrapper);
ExcelUtil.export(response, "区域品牌价格表数据" + DateUtil.time(), "区域品牌价格表数据表", list, BasicdataZonePriceExcel.class);
}
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicBrandDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataBrandDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicBrandEntity;
import com.logpm.basicdata.entity.BasicdataBrandEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 基础品牌表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicBrandDTO extends BasicBrandEntity {
public class BasicdataBrandDTO extends BasicdataBrandEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicClientDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataClientDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicClientEntity;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 基础客户表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicClientDTO extends BasicClientEntity {
public class BasicdataClientDTO extends BasicdataClientEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicFreightDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFreightDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicFreightEntity;
import com.logpm.basicdata.entity.BasicdataFreightEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 基础价格记录表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicFreightDTO extends BasicFreightEntity {
public class BasicdataFreightDTO extends BasicdataFreightEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicHistoricalContractDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataHistoricalContractDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 客户历史合同记录 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicHistoricalContractDTO extends BasicHistoricalContractEntity {
public class BasicdataHistoricalContractDTO extends BasicdataHistoricalContractEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicShopDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataShopDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicShopEntity;
import com.logpm.basicdata.entity.BasicdataShopEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 基础门店表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicShopDTO extends BasicShopEntity {
public class BasicdataShopDTO extends BasicdataShopEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicStorageServicesDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStorageServicesDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicStorageServicesEntity;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 门店服务仓库表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicStorageServicesDTO extends BasicStorageServicesEntity {
public class BasicdataStorageServicesDTO extends BasicdataStorageServicesEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicStoreBrandDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreBrandDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicStoreBrandEntity;
import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 门店品牌中间表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicStoreBrandDTO extends BasicStoreBrandEntity {
public class BasicdataStoreBrandDTO extends BasicdataStoreBrandEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicStoreContactDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreContactDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicStoreContactEntity;
import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 基础门店联系人表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicStoreContactDTO extends BasicStoreContactEntity {
public class BasicdataStoreContactDTO extends BasicdataStoreContactEntity {
private static final long serialVersionUID = 1L;
}

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicZonePriceDTO.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java

@ -16,7 +16,7 @@
*/
package com.logpm.basicdata.dto;
import com.logpm.basicdata.entity.BasicZonePriceEntity;
import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -24,11 +24,11 @@ import lombok.EqualsAndHashCode;
* 区域品牌价格表 数据传输对象实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BasicZonePriceDTO extends BasicZonePriceEntity {
public class BasicdataZonePriceDTO extends BasicdataZonePriceEntity {
private static final long serialVersionUID = 1L;
}

111
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicBrandExcel.java

@ -1,111 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础品牌表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicBrandExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 品牌名称
*/
@ColumnWidth(20)
@ExcelProperty("品牌名称")
private String brandName;
/**
* 品牌编号
*/
@ColumnWidth(20)
@ExcelProperty("品牌编号")
private String brandCode;
/**
* 品牌图标
*/
@ColumnWidth(20)
@ExcelProperty("品牌图标")
private String brandIcon;
/**
* 承接时间
*/
@ColumnWidth(20)
@ExcelProperty("承接时间")
private Date acceptanceTime;
}

238
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicFreightExcel.java

@ -1,238 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础价格记录表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicFreightExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 计算方式;1件 2方 3公斤
*/
@ColumnWidth(20)
@ExcelProperty("计算方式;1件 2方 3公斤")
private Integer formulaMode;
/**
* 物品名称
*/
@ColumnWidth(20)
@ExcelProperty("物品名称")
private String itemName;
/**
* 门店品牌记录表
*/
@ColumnWidth(20)
@ExcelProperty("门店品牌记录表")
private String storeBrandId;
/**
* 运费
*/
@ColumnWidth(20)
@ExcelProperty("运费")
private BigDecimal freight;
/**
* 送货费用
*/
@ColumnWidth(20)
@ExcelProperty("送货费用")
private BigDecimal deliveryExpense;
/**
* 提货费用
*/
@ColumnWidth(20)
@ExcelProperty("提货费用")
private BigDecimal deliveryCharge;
/**
* 仓库管理费用
*/
@ColumnWidth(20)
@ExcelProperty("仓库管理费用")
private BigDecimal warehouseOverhead;
/**
* 仓储费用
*/
@ColumnWidth(20)
@ExcelProperty("仓储费用")
private BigDecimal storageCharge;
/**
* 装卸费用
*/
@ColumnWidth(20)
@ExcelProperty("装卸费用")
private BigDecimal terminalCharges;
/**
* 其他费用
*/
@ColumnWidth(20)
@ExcelProperty("其他费用")
private BigDecimal otherCharges;
/**
* 末端仓
*/
@ColumnWidth(20)
@ExcelProperty("末端仓")
private String singleColon;
/**
* 发货单位
*/
@ColumnWidth(20)
@ExcelProperty("发货单位")
private String forwardingUnit;
/**
* 门店
*/
@ColumnWidth(20)
@ExcelProperty("门店")
private String shop;
/**
* 品牌
*/
@ColumnWidth(20)
@ExcelProperty("品牌")
private String brand;
/**
* 服务类型;1 2干仓 3干仓配 4干配
*/
@ColumnWidth(20)
@ExcelProperty("服务类型;1 干 2干仓 3干仓配 4干配")
private Integer typeService;
/**
* 结算方;1 商场 2工厂
*/
@ColumnWidth(20)
@ExcelProperty("结算方;1 商场 2工厂")
private Integer clearingForm;
/**
* 一级品类
*/
@ColumnWidth(20)
@ExcelProperty("一级品类")
private String firstClassCategory;
/**
* 一口价
*/
@ColumnWidth(20)
@ExcelProperty("一口价")
private BigDecimal fixedPrice;
/**
* 干线费用
*/
@ColumnWidth(20)
@ExcelProperty("干线费用")
private BigDecimal trunkCharge;
/**
* 生效时间
*/
@ColumnWidth(20)
@ExcelProperty("生效时间")
private Date effectiveTime;
/**
* 截至时间
*/
@ColumnWidth(20)
@ExcelProperty("截至时间")
private Date expirationTime;
/**
* 类型
*/
@ColumnWidth(20)
@ExcelProperty("类型")
private String type;
/**
* 标识
*/
@ColumnWidth(20)
@ExcelProperty("标识")
private String identification;
/**
* 仓储时间端状态;1 0-30天 2 0-60天 3 60天以上
*/
@ColumnWidth(20)
@ExcelProperty("仓储时间端状态;1 0-30天 2 0-60天 3 60天以上")
private Integer warehousingTimeCharge;
/**
* 仓储时间端费用
*/
@ColumnWidth(20)
@ExcelProperty("仓储时间端费用")
private BigDecimal warehousingTimeStatus;
}

111
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicHistoricalContractExcel.java

@ -1,111 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 客户历史合同记录 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicHistoricalContractExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 客户id
*/
@ColumnWidth(20)
@ExcelProperty("客户id")
private String clientId;
/**
* 合同开始时间
*/
@ColumnWidth(20)
@ExcelProperty("合同开始时间")
private String contractStartTime;
/**
* 合同结束时间
*/
@ColumnWidth(20)
@ExcelProperty("合同结束时间")
private String contractEntTime;
/**
* 合同文件
*/
@ColumnWidth(20)
@ExcelProperty("合同文件")
private String leaseAccessories;
}

153
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicShopExcel.java

@ -1,153 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础门店表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicShopExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 客户ID
*/
@ColumnWidth(20)
@ExcelProperty("客户ID")
private String clientId;
/**
* 门店编码
*/
@ColumnWidth(20)
@ExcelProperty("门店编码")
private String storeCode;
/**
* 门店名称
*/
@ColumnWidth(20)
@ExcelProperty("门店名称")
private String storeName;
/**
* 联系人
*/
@ColumnWidth(20)
@ExcelProperty("联系人")
private String linkman;
/**
* 联系电话
*/
@ColumnWidth(20)
@ExcelProperty("联系电话")
private String phone;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("省")
private String bladeRegionProvinceId;
/**
* 城市
*/
@ColumnWidth(20)
@ExcelProperty("城市")
private String bladeRegionCityId;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("区")
private String bladeRegionAreaId;
/**
* 详细地址
*/
@ColumnWidth(20)
@ExcelProperty("详细地址")
private String detailedAddress;
/**
* 入驻时间
*/
@ColumnWidth(20)
@ExcelProperty("入驻时间")
private Date checkInTime;
/**
* 退出时间
*/
@ColumnWidth(20)
@ExcelProperty("退出时间")
private Date postSetTime;
}

105
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStorageServicesExcel.java

@ -1,105 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 门店服务仓库表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicStorageServicesExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 门店ID
*/
@ColumnWidth(20)
@ExcelProperty("门店ID")
private String shopId;
/**
* 发货单位
*/
@ColumnWidth(20)
@ExcelProperty("发货单位")
private String forwardingUnit;
/**
* 服务仓库
*/
@ColumnWidth(20)
@ExcelProperty("服务仓库")
private String warehouseService;
}

99
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStoreBrandExcel.java

@ -1,99 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 门店品牌中间表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicStoreBrandExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 门店ID
*/
@ColumnWidth(20)
@ExcelProperty("门店ID")
private String shopId;
/**
* 品牌ID
*/
@ColumnWidth(20)
@ExcelProperty("品牌ID")
private String brandId;
}

105
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStoreContactExcel.java

@ -1,105 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础门店联系人表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicStoreContactExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
* 门店ID
*/
@ColumnWidth(20)
@ExcelProperty("门店ID")
private String shopId;
/**
* 联系人
*/
@ColumnWidth(20)
@ExcelProperty("联系人")
private String linkman;
/**
* 联系电话
*/
@ColumnWidth(20)
@ExcelProperty("联系电话")
private String phone;
}

154
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicZonePriceExcel.java

@ -1,154 +0,0 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 区域品牌价格表 Excel实体类
*
* @author cyz
* @since 2023-05-15
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicZonePriceExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("租户号")
private String tenantId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Integer isDeleted;
/**
* 预留1
*/
@ColumnWidth(20)
@ExcelProperty("预留1")
private String reserve1;
/**
* 预留2
*/
@ColumnWidth(20)
@ExcelProperty("预留2")
private String reserve2;
/**
* 预留3
*/
@ColumnWidth(20)
@ExcelProperty("预留3")
private String reserve3;
/**
* 预留4
*/
@ColumnWidth(20)
@ExcelProperty("预留4")
private String reserve4;
/**
* 预留5
*/
@ColumnWidth(20)
@ExcelProperty("预留5")
private String reserve5;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("省")
private String province;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("市")
private String city;
/**
* /
*/
@ColumnWidth(20)
@ExcelProperty("区/县")
private String district;
/**
* 品牌
*/
@ColumnWidth(20)
@ExcelProperty("品牌")
private String brand;
/**
* 费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用
*/
@ColumnWidth(20)
@ExcelProperty("费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用")
private String freightMark;
/**
* 费用
*/
@ColumnWidth(20)
@ExcelProperty("费用")
private String cost;
/**
* 仓储时间端状态;1 0-30天 2 0-60天 3 60天以上
*/
@ColumnWidth(20)
@ExcelProperty("仓储时间端状态;1 0-30天 2 0-60天 3 60天以上")
private Integer warehousingTimeStatus;
/**
* 仓储时间端费用
*/
@ColumnWidth(20)
@ExcelProperty("仓储时间端费用")
private BigDecimal warehousingTimeCharge;
/**
* 末端仓
*/
@ColumnWidth(20)
@ExcelProperty("末端仓")
private String goalGranary;
/**
* 标识
*/
@ColumnWidth(20)
@ExcelProperty("标识")
private Integer identification;
/**
* 状态
*/
@ColumnWidth(20)
@ExcelProperty("状态")
private Integer condition;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataBrandExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础品牌表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataBrandExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

4
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicClientExcel.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataClientExcel.java

@ -31,13 +31,13 @@ import java.io.Serializable;
* 基础客户表 Excel实体类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicClientExcel implements Serializable {
public class BasicdataClientExcel implements Serializable {
private static final long serialVersionUID = 1L;

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFreightExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础价格记录表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataFreightExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataHistoricalContractExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 客户历史合同记录 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataHistoricalContractExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataShopExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础门店表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataShopExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStorageServicesExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 门店服务仓库表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataStorageServicesExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreBrandExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 门店品牌中间表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataStoreBrandExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreContactExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 基础门店联系人表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataStoreContactExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataZonePriceExcel.java

@ -0,0 +1,44 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
/**
* 区域品牌价格表 Excel实体类
*
* @author cyz
* @since 2023-05-16
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataZonePriceExcel implements Serializable {
private static final long serialVersionUID = 1L;
}

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicZonePriceClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java

@ -21,32 +21,32 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicZonePriceEntity;
import com.logpm.basicdata.service.IBasicZonePriceService;
import com.logpm.basicdata.entity.BasicdataBrandEntity;
import com.logpm.basicdata.service.IBasicdataBrandService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
/**
* 区域品牌价格 Feign实现类
* 基础品牌 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicZonePriceClient implements IBasicZonePriceClient {
public class BasicdataBrandClient implements IBasicdataBrandClient {
private final IBasicZonePriceService basicZonePriceService;
private final IBasicdataBrandService basicdataBrandService;
@Override
@GetMapping(TOP)
public BladePage<BasicZonePriceEntity> top(Integer current, Integer size) {
public BladePage<BasicdataBrandEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicZonePriceEntity> page = basicZonePriceService.page(Condition.getPage(query));
IPage<BasicdataBrandEntity> page = basicdataBrandService.page(Condition.getPage(query));
return BladePage.of(page);
}

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicStoreBrandClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java

@ -21,32 +21,32 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicStoreBrandEntity;
import com.logpm.basicdata.service.IBasicStoreBrandService;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.service.IBasicdataClientService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
/**
* 基础品牌 Feign实现类
* 基础客户 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicStoreBrandClient implements IBasicStoreBrandClient {
public class BasicdataClientClient implements IBasicdataClientClient {
private final IBasicStoreBrandService basicStoreBrandService;
private final IBasicdataClientService basicdataClientService;
@Override
@GetMapping(TOP)
public BladePage<BasicStoreBrandEntity> top(Integer current, Integer size) {
public BladePage<BasicdataClientEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicStoreBrandEntity> page = basicStoreBrandService.page(Condition.getPage(query));
IPage<BasicdataClientEntity> page = basicdataClientService.page(Condition.getPage(query));
return BladePage.of(page);
}

14
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicFreightClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataFreightClient.java

@ -21,8 +21,8 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicFreightEntity;
import com.logpm.basicdata.service.IBasicFreightService;
import com.logpm.basicdata.entity.BasicdataFreightEntity;
import com.logpm.basicdata.service.IBasicdataFreightService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@ -31,22 +31,22 @@ import springfox.documentation.annotations.ApiIgnore;
* 基础价格记录表 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicFreightClient implements IBasicFreightClient {
public class BasicdataFreightClient implements IBasicdataFreightClient {
private final IBasicFreightService basicFreightService;
private final IBasicdataFreightService basicdataFreightService;
@Override
@GetMapping(TOP)
public BladePage<BasicFreightEntity> top(Integer current, Integer size) {
public BladePage<BasicdataFreightEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicFreightEntity> page = basicFreightService.page(Condition.getPage(query));
IPage<BasicdataFreightEntity> page = basicdataFreightService.page(Condition.getPage(query));
return BladePage.of(page);
}

14
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicHistoricalContractClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataHistoricalContractClient.java

@ -21,8 +21,8 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
import com.logpm.basicdata.service.IBasicHistoricalContractService;
import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
import com.logpm.basicdata.service.IBasicdataHistoricalContractService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@ -31,22 +31,22 @@ import springfox.documentation.annotations.ApiIgnore;
* 客户历史合同记录 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicHistoricalContractClient implements IBasicHistoricalContractClient {
public class BasicdataHistoricalContractClient implements IBasicdataHistoricalContractClient {
private final IBasicHistoricalContractService basicHistoricalContractService;
private final IBasicdataHistoricalContractService basicdataHistoricalContractService;
@Override
@GetMapping(TOP)
public BladePage<BasicHistoricalContractEntity> top(Integer current, Integer size) {
public BladePage<BasicdataHistoricalContractEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicHistoricalContractEntity> page = basicHistoricalContractService.page(Condition.getPage(query));
IPage<BasicdataHistoricalContractEntity> page = basicdataHistoricalContractService.page(Condition.getPage(query));
return BladePage.of(page);
}

14
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicShopClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataShopClient.java

@ -21,8 +21,8 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicShopEntity;
import com.logpm.basicdata.service.IBasicShopService;
import com.logpm.basicdata.entity.BasicdataShopEntity;
import com.logpm.basicdata.service.IBasicdataShopService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@ -31,22 +31,22 @@ import springfox.documentation.annotations.ApiIgnore;
* 基础门店表 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicShopClient implements IBasicShopClient {
public class BasicdataShopClient implements IBasicdataShopClient {
private final IBasicShopService basicShopService;
private final IBasicdataShopService basicdataShopService;
@Override
@GetMapping(TOP)
public BladePage<BasicShopEntity> top(Integer current, Integer size) {
public BladePage<BasicdataShopEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicShopEntity> page = basicShopService.page(Condition.getPage(query));
IPage<BasicdataShopEntity> page = basicdataShopService.page(Condition.getPage(query));
return BladePage.of(page);
}

14
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicStorageServicesClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java

@ -21,8 +21,8 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicStorageServicesEntity;
import com.logpm.basicdata.service.IBasicStorageServicesService;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
import com.logpm.basicdata.service.IBasicdataStorageServicesService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@ -31,22 +31,22 @@ import springfox.documentation.annotations.ApiIgnore;
* 门店服务仓库表 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicStorageServicesClient implements IBasicStorageServicesClient {
public class BasicdataStorageServicesClient implements IBasicdataStorageServicesClient {
private final IBasicStorageServicesService basicStorageServicesService;
private final IBasicdataStorageServicesService basicdataStorageServicesService;
@Override
@GetMapping(TOP)
public BladePage<BasicStorageServicesEntity> top(Integer current, Integer size) {
public BladePage<BasicdataStorageServicesEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicStorageServicesEntity> page = basicStorageServicesService.page(Condition.getPage(query));
IPage<BasicdataStorageServicesEntity> page = basicdataStorageServicesService.page(Condition.getPage(query));
return BladePage.of(page);
}

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicBrandClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java

@ -21,32 +21,32 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicBrandEntity;
import com.logpm.basicdata.service.IBasicBrandService;
import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
import com.logpm.basicdata.service.IBasicdataStoreBrandService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
/**
* 基础品牌 Feign实现类
* 门店品牌中间 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicBrandClient implements IBasicBrandClient {
public class BasicdataStoreBrandClient implements IBasicdataStoreBrandClient {
private final IBasicBrandService basicBrandService;
private final IBasicdataStoreBrandService basicdataStoreBrandService;
@Override
@GetMapping(TOP)
public BladePage<BasicBrandEntity> top(Integer current, Integer size) {
public BladePage<BasicdataStoreBrandEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicBrandEntity> page = basicBrandService.page(Condition.getPage(query));
IPage<BasicdataStoreBrandEntity> page = basicdataStoreBrandService.page(Condition.getPage(query));
return BladePage.of(page);
}

14
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicStoreContactClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreContactClient.java

@ -21,8 +21,8 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicStoreContactEntity;
import com.logpm.basicdata.service.IBasicStoreContactService;
import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
import com.logpm.basicdata.service.IBasicdataStoreContactService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@ -31,22 +31,22 @@ import springfox.documentation.annotations.ApiIgnore;
* 基础门店联系人表 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicStoreContactClient implements IBasicStoreContactClient {
public class BasicdataStoreContactClient implements IBasicdataStoreContactClient {
private final IBasicStoreContactService basicStoreContactService;
private final IBasicdataStoreContactService basicdataStoreContactService;
@Override
@GetMapping(TOP)
public BladePage<BasicStoreContactEntity> top(Integer current, Integer size) {
public BladePage<BasicdataStoreContactEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicStoreContactEntity> page = basicStoreContactService.page(Condition.getPage(query));
IPage<BasicdataStoreContactEntity> page = basicdataStoreContactService.page(Condition.getPage(query));
return BladePage.of(page);
}

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicClientClient.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataZonePriceClient.java

@ -21,32 +21,32 @@ import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.logpm.basicdata.entity.BasicClientEntity;
import com.logpm.basicdata.service.IBasicClientService;
import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
import com.logpm.basicdata.service.IBasicdataZonePriceService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
/**
* 基础客户 Feign实现类
* 区域品牌价格 Feign实现类
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
@ApiIgnore()
@RestController
@AllArgsConstructor
public class BasicClientClient implements IBasicClientClient {
public class BasicdataZonePriceClient implements IBasicdataZonePriceClient {
private final IBasicClientService basicClientService;
private final IBasicdataZonePriceService basicdataZonePriceService;
@Override
@GetMapping(TOP)
public BladePage<BasicClientEntity> top(Integer current, Integer size) {
public BladePage<BasicdataZonePriceEntity> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BasicClientEntity> page = basicClientService.page(Condition.getPage(query));
IPage<BasicdataZonePriceEntity> page = basicdataZonePriceService.page(Condition.getPage(query));
return BladePage.of(page);
}

37
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicBrandMapper.xml

@ -1,37 +0,0 @@
<?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.logpm.basicdata.mapper.BasicBrandMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicBrandResultMap" type="com.logpm.basicdata.entity.BasicBrandEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="brand_name" property="brandName"/>
<result column="brand_code" property="brandCode"/>
<result column="brand_icon" property="brandIcon"/>
<result column="acceptance_time" property="acceptanceTime"/>
</resultMap>
<select id="selectBasicBrandPage" resultMap="basicBrandResultMap">
select * from logpm_basic_brand where is_deleted = 0
</select>
<select id="exportBasicBrand" resultType="com.logpm.basicdata.excel.BasicBrandExcel">
SELECT * FROM logpm_basic_brand ${ew.customSqlSegment}
</select>
</mapper>

58
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicFreightMapper.xml

@ -1,58 +0,0 @@
<?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.logpm.basicdata.mapper.BasicFreightMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicFreightResultMap" type="com.logpm.basicdata.entity.BasicFreightEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="formula_mode" property="formulaMode"/>
<result column="item_name" property="itemName"/>
<result column="store_brand_id" property="storeBrandId"/>
<result column="freight" property="freight"/>
<result column="delivery_expense" property="deliveryExpense"/>
<result column="delivery_charge" property="deliveryCharge"/>
<result column="warehouse_overhead" property="warehouseOverhead"/>
<result column="storage_charge" property="storageCharge"/>
<result column="terminal_charges" property="terminalCharges"/>
<result column="other_charges" property="otherCharges"/>
<result column="single_colon" property="singleColon"/>
<result column="forwarding_unit" property="forwardingUnit"/>
<result column="shop" property="shop"/>
<result column="brand" property="brand"/>
<result column="type_service" property="typeService"/>
<result column="clearing_form" property="clearingForm"/>
<result column="first_class_category" property="firstClassCategory"/>
<result column="fixed_price" property="fixedPrice"/>
<result column="trunk_charge" property="trunkCharge"/>
<result column="effective_time" property="effectiveTime"/>
<result column="expiration_time" property="expirationTime"/>
<result column="type" property="type"/>
<result column="identification" property="identification"/>
<result column="warehousing_time_charge" property="warehousingTimeCharge"/>
<result column="warehousing_time_status" property="warehousingTimeStatus"/>
</resultMap>
<select id="selectBasicFreightPage" resultMap="basicFreightResultMap">
select * from logpm_basic_freight where is_deleted = 0
</select>
<select id="exportBasicFreight" resultType="com.logpm.basicdata.excel.BasicFreightExcel">
SELECT * FROM logpm_basic_freight ${ew.customSqlSegment}
</select>
</mapper>

37
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicHistoricalContractMapper.xml

@ -1,37 +0,0 @@
<?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.logpm.basicdata.mapper.BasicHistoricalContractMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicHistoricalContractResultMap" type="com.logpm.basicdata.entity.BasicHistoricalContractEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="client_id" property="clientId"/>
<result column="contract_start_time" property="contractStartTime"/>
<result column="contract_ent_time" property="contractEntTime"/>
<result column="lease_accessories" property="leaseAccessories"/>
</resultMap>
<select id="selectBasicHistoricalContractPage" resultMap="basicHistoricalContractResultMap">
select * from logpm_basic_historical_contract where is_deleted = 0
</select>
<select id="exportBasicHistoricalContract" resultType="com.logpm.basicdata.excel.BasicHistoricalContractExcel">
SELECT * FROM logpm_basic_historical_contract ${ew.customSqlSegment}
</select>
</mapper>

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicShopMapper.xml

@ -1,44 +0,0 @@
<?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.logpm.basicdata.mapper.BasicShopMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicShopResultMap" type="com.logpm.basicdata.entity.BasicShopEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="client_id" property="clientId"/>
<result column="store_code" property="storeCode"/>
<result column="store_name" property="storeName"/>
<result column="linkman" property="linkman"/>
<result column="phone" property="phone"/>
<result column="blade_region_province_id" property="bladeRegionProvinceId"/>
<result column="blade_region_city_id" property="bladeRegionCityId"/>
<result column="blade_region_area_id" property="bladeRegionAreaId"/>
<result column="detailed_address" property="detailedAddress"/>
<result column="check_in_time" property="checkInTime"/>
<result column="post_set_time" property="postSetTime"/>
</resultMap>
<select id="selectBasicShopPage" resultMap="basicShopResultMap">
select * from logpm_basic_shop where is_deleted = 0
</select>
<select id="exportBasicShop" resultType="com.logpm.basicdata.excel.BasicShopExcel">
SELECT * FROM logpm_basic_shop ${ew.customSqlSegment}
</select>
</mapper>

36
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStorageServicesMapper.xml

@ -1,36 +0,0 @@
<?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.logpm.basicdata.mapper.BasicStorageServicesMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicStorageServicesResultMap" type="com.logpm.basicdata.entity.BasicStorageServicesEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="shop_id" property="shopId"/>
<result column="forwarding_unit" property="forwardingUnit"/>
<result column="warehouse_service" property="warehouseService"/>
</resultMap>
<select id="selectBasicStorageServicesPage" resultMap="basicStorageServicesResultMap">
select * from logpm_basic_storage_services where is_deleted = 0
</select>
<select id="exportBasicStorageServices" resultType="com.logpm.basicdata.excel.BasicStorageServicesExcel">
SELECT * FROM logpm_basic_storage_services ${ew.customSqlSegment}
</select>
</mapper>

35
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreBrandMapper.xml

@ -1,35 +0,0 @@
<?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.logpm.basicdata.mapper.BasicStoreBrandMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicStoreBrandResultMap" type="com.logpm.basicdata.entity.BasicStoreBrandEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="shop_id" property="shopId"/>
<result column="brand_id" property="brandId"/>
</resultMap>
<select id="selectBasicStoreBrandPage" resultMap="basicStoreBrandResultMap">
select * from logpm_basic_store_brand where is_deleted = 0
</select>
<select id="exportBasicStoreBrand" resultType="com.logpm.basicdata.excel.BasicStoreBrandExcel">
SELECT * FROM logpm_basic_store_brand ${ew.customSqlSegment}
</select>
</mapper>

36
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreContactMapper.xml

@ -1,36 +0,0 @@
<?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.logpm.basicdata.mapper.BasicStoreContactMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicStoreContactResultMap" type="com.logpm.basicdata.entity.BasicStoreContactEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="shop_id" property="shopId"/>
<result column="linkman" property="linkman"/>
<result column="phone" property="phone"/>
</resultMap>
<select id="selectBasicStoreContactPage" resultMap="basicStoreContactResultMap">
select * from logpm_basic_store_contact where is_deleted = 0
</select>
<select id="exportBasicStoreContact" resultType="com.logpm.basicdata.excel.BasicStoreContactExcel">
SELECT * FROM logpm_basic_store_contact ${ew.customSqlSegment}
</select>
</mapper>

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicZonePriceMapper.xml

@ -1,44 +0,0 @@
<?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.logpm.basicdata.mapper.BasicZonePriceMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicZonePriceResultMap" type="com.logpm.basicdata.entity.BasicZonePriceEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="id" property="id"/>
<result column="reserve1" property="reserve1"/>
<result column="reserve2" property="reserve2"/>
<result column="reserve3" property="reserve3"/>
<result column="reserve4" property="reserve4"/>
<result column="reserve5" property="reserve5"/>
<result column="province" property="province"/>
<result column="city" property="city"/>
<result column="district" property="district"/>
<result column="brand" property="brand"/>
<result column="freight_mark" property="freightMark"/>
<result column="cost" property="cost"/>
<result column="warehousing_time_status" property="warehousingTimeStatus"/>
<result column="warehousing_time_charge" property="warehousingTimeCharge"/>
<result column="goal_granary" property="goalGranary"/>
<result column="identification" property="identification"/>
<result column="condition" property="condition"/>
</resultMap>
<select id="selectBasicZonePricePage" resultMap="basicZonePriceResultMap">
select * from logpm_basic_zone_price where is_deleted = 0
</select>
<select id="exportBasicZonePrice" resultType="com.logpm.basicdata.excel.BasicZonePriceExcel">
SELECT * FROM logpm_basic_zone_price ${ew.customSqlSegment}
</select>
</mapper>

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicBrandMapper.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandMapper.java

@ -16,9 +16,9 @@
*/
package com.logpm.basicdata.mapper;
import com.logpm.basicdata.entity.BasicBrandEntity;
import com.logpm.basicdata.vo.BasicBrandVO;
import com.logpm.basicdata.excel.BasicBrandExcel;
import com.logpm.basicdata.entity.BasicdataBrandEntity;
import com.logpm.basicdata.vo.BasicdataBrandVO;
import com.logpm.basicdata.excel.BasicdataBrandExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,18 +29,18 @@ import java.util.List;
* 基础品牌表 Mapper 接口
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
public interface BasicBrandMapper extends BaseMapper<BasicBrandEntity> {
public interface BasicdataBrandMapper extends BaseMapper<BasicdataBrandEntity> {
/**
* 自定义分页
*
* @param page
* @param basicBrand
* @param basicdataBrand
* @return
*/
List<BasicBrandVO> selectBasicBrandPage(IPage page, BasicBrandVO basicBrand);
List<BasicdataBrandVO> selectBasicdataBrandPage(IPage page, BasicdataBrandVO basicdataBrand);
/**
@ -49,6 +49,6 @@ public interface BasicBrandMapper extends BaseMapper<BasicBrandEntity> {
* @param queryWrapper
* @return
*/
List<BasicBrandExcel> exportBasicBrand(@Param("ew") Wrapper<BasicBrandEntity> queryWrapper);
List<BasicdataBrandExcel> exportBasicdataBrand(@Param("ew") Wrapper<BasicdataBrandEntity> queryWrapper);
}

19
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandMapper.xml

@ -0,0 +1,19 @@
<?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.logpm.basicdata.mapper.BasicdataBrandMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicdataBrandResultMap" type="com.logpm.basicdata.entity.BasicdataBrandEntity">
</resultMap>
<select id="selectBasicdataBrandPage" resultMap="basicdataBrandResultMap">
select * from logpm_basicdata_brand where is_deleted = 0
</select>
<select id="exportBasicdataBrand" resultType="com.logpm.basicdata.excel.BasicdataBrandExcel">
SELECT * FROM logpm_basicdata_brand ${ew.customSqlSegment}
</select>
</mapper>

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicClientMapper.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java

@ -16,9 +16,9 @@
*/
package com.logpm.basicdata.mapper;
import com.logpm.basicdata.entity.BasicClientEntity;
import com.logpm.basicdata.vo.BasicClientVO;
import com.logpm.basicdata.excel.BasicClientExcel;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.vo.BasicdataClientVO;
import com.logpm.basicdata.excel.BasicdataClientExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,18 +29,18 @@ import java.util.List;
* 基础客户表 Mapper 接口
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
public interface BasicClientMapper extends BaseMapper<BasicClientEntity> {
public interface BasicdataClientMapper extends BaseMapper<BasicdataClientEntity> {
/**
* 自定义分页
*
* @param page
* @param basicClient
* @param basicdataClient
* @return
*/
List<BasicClientVO> selectBasicClientPage(IPage page, BasicClientVO basicClient);
List<BasicdataClientVO> selectBasicdataClientPage(IPage page, BasicdataClientVO basicdataClient);
/**
@ -49,6 +49,6 @@ public interface BasicClientMapper extends BaseMapper<BasicClientEntity> {
* @param queryWrapper
* @return
*/
List<BasicClientExcel> exportBasicClient(@Param("ew") Wrapper<BasicClientEntity> queryWrapper);
List<BasicdataClientExcel> exportBasicdataClient(@Param("ew") Wrapper<BasicdataClientEntity> queryWrapper);
}

12
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicClientMapper.xml → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml

@ -1,9 +1,9 @@
<?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.logpm.basicdata.mapper.BasicClientMapper">
<mapper namespace="com.logpm.basicdata.mapper.BasicdataClientMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicClientResultMap" type="com.logpm.basicdata.entity.BasicClientEntity">
<resultMap id="basicdataClientResultMap" type="com.logpm.basicdata.entity.BasicdataClientEntity">
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
@ -29,13 +29,13 @@
</resultMap>
<select id="selectBasicClientPage" resultMap="basicClientResultMap">
select * from logpm_basic_client where is_deleted = 0
<select id="selectBasicdataClientPage" resultMap="basicdataClientResultMap">
select * from logpm_basicdata_client where is_deleted = 0
</select>
<select id="exportBasicClient" resultType="com.logpm.basicdata.excel.BasicClientExcel">
SELECT * FROM logpm_basic_client ${ew.customSqlSegment}
<select id="exportBasicdataClient" resultType="com.logpm.basicdata.excel.BasicdataClientExcel">
SELECT * FROM logpm_basicdata_client ${ew.customSqlSegment}
</select>
</mapper>

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicFreightMapper.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFreightMapper.java

@ -16,9 +16,9 @@
*/
package com.logpm.basicdata.mapper;
import com.logpm.basicdata.entity.BasicFreightEntity;
import com.logpm.basicdata.vo.BasicFreightVO;
import com.logpm.basicdata.excel.BasicFreightExcel;
import com.logpm.basicdata.entity.BasicdataFreightEntity;
import com.logpm.basicdata.vo.BasicdataFreightVO;
import com.logpm.basicdata.excel.BasicdataFreightExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,18 +29,18 @@ import java.util.List;
* 基础价格记录表 Mapper 接口
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
public interface BasicFreightMapper extends BaseMapper<BasicFreightEntity> {
public interface BasicdataFreightMapper extends BaseMapper<BasicdataFreightEntity> {
/**
* 自定义分页
*
* @param page
* @param basicFreight
* @param basicdataFreight
* @return
*/
List<BasicFreightVO> selectBasicFreightPage(IPage page, BasicFreightVO basicFreight);
List<BasicdataFreightVO> selectBasicdataFreightPage(IPage page, BasicdataFreightVO basicdataFreight);
/**
@ -49,6 +49,6 @@ public interface BasicFreightMapper extends BaseMapper<BasicFreightEntity> {
* @param queryWrapper
* @return
*/
List<BasicFreightExcel> exportBasicFreight(@Param("ew") Wrapper<BasicFreightEntity> queryWrapper);
List<BasicdataFreightExcel> exportBasicdataFreight(@Param("ew") Wrapper<BasicdataFreightEntity> queryWrapper);
}

19
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFreightMapper.xml

@ -0,0 +1,19 @@
<?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.logpm.basicdata.mapper.BasicdataFreightMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicdataFreightResultMap" type="com.logpm.basicdata.entity.BasicdataFreightEntity">
</resultMap>
<select id="selectBasicdataFreightPage" resultMap="basicdataFreightResultMap">
select * from logpm_basicdata_freight where is_deleted = 0
</select>
<select id="exportBasicdataFreight" resultType="com.logpm.basicdata.excel.BasicdataFreightExcel">
SELECT * FROM logpm_basicdata_freight ${ew.customSqlSegment}
</select>
</mapper>

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicHistoricalContractMapper.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.java

@ -16,9 +16,9 @@
*/
package com.logpm.basicdata.mapper;
import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
import com.logpm.basicdata.vo.BasicHistoricalContractVO;
import com.logpm.basicdata.excel.BasicHistoricalContractExcel;
import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
import com.logpm.basicdata.vo.BasicdataHistoricalContractVO;
import com.logpm.basicdata.excel.BasicdataHistoricalContractExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,18 +29,18 @@ import java.util.List;
* 客户历史合同记录 Mapper 接口
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
public interface BasicHistoricalContractMapper extends BaseMapper<BasicHistoricalContractEntity> {
public interface BasicdataHistoricalContractMapper extends BaseMapper<BasicdataHistoricalContractEntity> {
/**
* 自定义分页
*
* @param page
* @param basicHistoricalContract
* @param basicdataHistoricalContract
* @return
*/
List<BasicHistoricalContractVO> selectBasicHistoricalContractPage(IPage page, BasicHistoricalContractVO basicHistoricalContract);
List<BasicdataHistoricalContractVO> selectBasicdataHistoricalContractPage(IPage page, BasicdataHistoricalContractVO basicdataHistoricalContract);
/**
@ -49,6 +49,6 @@ public interface BasicHistoricalContractMapper extends BaseMapper<BasicHistorica
* @param queryWrapper
* @return
*/
List<BasicHistoricalContractExcel> exportBasicHistoricalContract(@Param("ew") Wrapper<BasicHistoricalContractEntity> queryWrapper);
List<BasicdataHistoricalContractExcel> exportBasicdataHistoricalContract(@Param("ew") Wrapper<BasicdataHistoricalContractEntity> queryWrapper);
}

19
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.xml

@ -0,0 +1,19 @@
<?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.logpm.basicdata.mapper.BasicdataHistoricalContractMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicdataHistoricalContractResultMap" type="com.logpm.basicdata.entity.BasicdataHistoricalContractEntity">
</resultMap>
<select id="selectBasicdataHistoricalContractPage" resultMap="basicdataHistoricalContractResultMap">
select * from logpm_basicdata_historical_contract where is_deleted = 0
</select>
<select id="exportBasicdataHistoricalContract" resultType="com.logpm.basicdata.excel.BasicdataHistoricalContractExcel">
SELECT * FROM logpm_basicdata_historical_contract ${ew.customSqlSegment}
</select>
</mapper>

16
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicShopMapper.java → blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.java

@ -16,9 +16,9 @@
*/
package com.logpm.basicdata.mapper;
import com.logpm.basicdata.entity.BasicShopEntity;
import com.logpm.basicdata.vo.BasicShopVO;
import com.logpm.basicdata.excel.BasicShopExcel;
import com.logpm.basicdata.entity.BasicdataShopEntity;
import com.logpm.basicdata.vo.BasicdataShopVO;
import com.logpm.basicdata.excel.BasicdataShopExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,18 +29,18 @@ import java.util.List;
* 基础门店表 Mapper 接口
*
* @author cyz
* @since 2023-05-15
* @since 2023-05-16
*/
public interface BasicShopMapper extends BaseMapper<BasicShopEntity> {
public interface BasicdataShopMapper extends BaseMapper<BasicdataShopEntity> {
/**
* 自定义分页
*
* @param page
* @param basicShop
* @param basicdataShop
* @return
*/
List<BasicShopVO> selectBasicShopPage(IPage page, BasicShopVO basicShop);
List<BasicdataShopVO> selectBasicdataShopPage(IPage page, BasicdataShopVO basicdataShop);
/**
@ -49,6 +49,6 @@ public interface BasicShopMapper extends BaseMapper<BasicShopEntity> {
* @param queryWrapper
* @return
*/
List<BasicShopExcel> exportBasicShop(@Param("ew") Wrapper<BasicShopEntity> queryWrapper);
List<BasicdataShopExcel> exportBasicdataShop(@Param("ew") Wrapper<BasicdataShopEntity> queryWrapper);
}

19
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml

@ -0,0 +1,19 @@
<?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.logpm.basicdata.mapper.BasicdataShopMapper">
<!-- 通用查询映射结果 -->
<resultMap id="basicdataShopResultMap" type="com.logpm.basicdata.entity.BasicdataShopEntity">
</resultMap>
<select id="selectBasicdataShopPage" resultMap="basicdataShopResultMap">
select * from logpm_basicdata_shop where is_deleted = 0
</select>
<select id="exportBasicdataShop" resultType="com.logpm.basicdata.excel.BasicdataShopExcel">
SELECT * FROM logpm_basicdata_shop ${ew.customSqlSegment}
</select>
</mapper>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save