home il y a 2 ans
Parent
commit
d4370882c4
25 fichiers modifiés avec 50 ajouts et 24 suppressions
  1. 1 0
      hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java
  2. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalDetailsMapper.java
  3. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalInfoMapper.java
  4. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.java
  5. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/classify/ClassifyMapper.java
  6. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/customer/CustomerInfoMapper.java
  7. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/excel/ExcelImportLogMapper.java
  8. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsCompanyMapper.java
  9. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsDetailsMapper.java
  10. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsInfoMapper.java
  11. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/material/MaterialMapper.java
  12. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdDetailsMapper.java
  13. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdMapper.java
  14. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesDetailsMapper.java
  15. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesMapper.java
  16. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductCombinationMapper.java
  17. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductInfoMapper.java
  18. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductSpuMapper.java
  19. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/purchase/PurchaseMapper.java
  20. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.java
  21. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockMapper.java
  22. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/supplier/SupplierMapper.java
  23. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/supplier/SupplierPriceMapper.java
  24. 2 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/system/SystemConfigMapper.java
  25. 3 1
      hx-service/victoriatourist/src/main/java/com/fjhx/mapper/warehouse/WarehouseMapper.java

+ 1 - 0
hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java

@@ -117,6 +117,7 @@ public class CodeGenerator {
         strategy.setSuperServiceClass(BASE_SERVICE_PATH);
         // 实体继承规则
         strategy.setSuperEntityClass(BASE_ENTITY_PATH);
+        strategy.setSuperMapperClass("com.github.yulichang.base.MPJBaseMapper");
         strategy.setTableFillList(Arrays.asList(
                 new TableFill("del_flag", FieldFill.INSERT),
                 new TableFill("version", FieldFill.INSERT)));

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalDetailsMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.abnormal;
 
 import com.fjhx.entity.abnormal.AbnormalDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-09
  */
-public interface AbnormalDetailsMapper extends BaseMapper<AbnormalDetails> {
+public interface AbnormalDetailsMapper extends MPJBaseMapper<AbnormalDetails> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalInfoMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.abnormal;
 
 import com.fjhx.entity.abnormal.AbnormalInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-09
  */
-public interface AbnormalInfoMapper extends BaseMapper<AbnormalInfo> {
+public interface AbnormalInfoMapper extends MPJBaseMapper<AbnormalInfo> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.java

@@ -5,6 +5,7 @@ import com.fjhx.entity.apply.ApplyPurchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.supplier.SupplierPrice;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.apply.ApplyPurchase;
@@ -21,7 +22,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-28
  */
-public interface ApplyPurchaseMapper extends BaseMapper<ApplyPurchase> {
+public interface ApplyPurchaseMapper extends MPJBaseMapper<ApplyPurchase> {
 
     Page<ApplyPurchase> getPage(@Param("page") Page<ApplyPurchase> page, @Param("ew") IWrapper<ApplyPurchase> wrapper);
 

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/classify/ClassifyMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.classify;
 
 import com.fjhx.entity.classify.Classify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface ClassifyMapper extends BaseMapper<Classify> {
+public interface ClassifyMapper extends MPJBaseMapper<Classify> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/customer/CustomerInfoMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.customer;
 
 import com.fjhx.entity.customer.CustomerInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-02
  */
-public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
+public interface CustomerInfoMapper extends MPJBaseMapper<CustomerInfo> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/excel/ExcelImportLogMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.excel;
 
 import com.fjhx.entity.excel.ExcelImportLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-07
  */
-public interface ExcelImportLogMapper extends BaseMapper<ExcelImportLog> {
+public interface ExcelImportLogMapper extends MPJBaseMapper<ExcelImportLog> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsCompanyMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.logistics;
 
 import com.fjhx.entity.logistics.LogisticsCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-07
  */
-public interface LogisticsCompanyMapper extends BaseMapper<LogisticsCompany> {
+public interface LogisticsCompanyMapper extends MPJBaseMapper<LogisticsCompany> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsDetailsMapper.java

@@ -3,6 +3,7 @@ package com.fjhx.mapper.logistics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.logistics.LogisticsDetails;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +17,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-30
  */
-public interface LogisticsDetailsMapper extends BaseMapper<LogisticsDetails> {
+public interface LogisticsDetailsMapper extends MPJBaseMapper<LogisticsDetails> {
 
     List<Map<String, Object>> getLogisticsDetailsByLogisticsId(@Param("ew") IWrapper<Object> wrapper);
 

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsInfoMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.logistics;
 
 import com.fjhx.entity.logistics.LogisticsInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-30
  */
-public interface LogisticsInfoMapper extends BaseMapper<LogisticsInfo> {
+public interface LogisticsInfoMapper extends MPJBaseMapper<LogisticsInfo> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/material/MaterialMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.material;
 
 import com.fjhx.entity.material.Material;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface MaterialMapper extends BaseMapper<Material> {
+public interface MaterialMapper extends MPJBaseMapper<Material> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdDetailsMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.order;
 
 import com.fjhx.entity.order.OrderJdDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-08
  */
-public interface OrderJdDetailsMapper extends BaseMapper<OrderJdDetails> {
+public interface OrderJdDetailsMapper extends MPJBaseMapper<OrderJdDetails> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.order.OrderJd;
 import com.fjhx.params.order.OrderJdEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-12-08
  */
-public interface OrderJdMapper extends BaseMapper<OrderJd> {
+public interface OrderJdMapper extends MPJBaseMapper<OrderJd> {
 
     Page<OrderJdEx> getPage(@Param("page") Page<OrderJd> page, @Param("ew") IWrapper<Object> wrapper);
 

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesDetailsMapper.java

@@ -4,6 +4,7 @@ import com.fjhx.entity.order.OrderSalesDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.params.order.OrderSalesDetailsEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +17,7 @@ import java.util.List;
  * @author ${author}
  * @since 2022-12-02
  */
-public interface OrderSalesDetailsMapper extends BaseMapper<OrderSalesDetails> {
+public interface OrderSalesDetailsMapper extends MPJBaseMapper<OrderSalesDetails> {
 
     List<OrderSalesDetailsEx> listByOrderSalesId(@Param("ew") IWrapper<Object> wrapper);
 

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.order.OrderSales;
 import com.fjhx.params.order.OrderSalesEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-12-02
  */
-public interface OrderSalesMapper extends BaseMapper<OrderSales> {
+public interface OrderSalesMapper extends MPJJoinMapper<OrderSales> {
 
     Page<OrderSalesEx> getPage(@Param("page") Page<OrderSales> page, @Param("ew") IWrapper<Object> wrapper);
 

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductCombinationMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.product;
 
 import com.fjhx.entity.product.ProductCombination;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-30
  */
-public interface ProductCombinationMapper extends BaseMapper<ProductCombination> {
+public interface ProductCombinationMapper extends MPJJoinMapper<ProductCombination> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductInfoMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.product.ProductInfo;
 import com.fjhx.params.product.ProductCombinationEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -17,7 +18,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-29
  */
-public interface ProductInfoMapper extends BaseMapper<ProductInfo> {
+public interface ProductInfoMapper extends MPJJoinMapper<ProductInfo> {
 
 
     Page<Map<String, Object>> getPage(@Param("page") Page<ProductInfo> page, @Param("ew") IWrapper<ProductInfo> wrapper);

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductSpuMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.product;
 
 import com.fjhx.entity.product.ProductSpu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-25
  */
-public interface ProductSpuMapper extends BaseMapper<ProductSpu> {
+public interface ProductSpuMapper extends MPJJoinMapper<ProductSpu> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/purchase/PurchaseMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.purchase;
 
 import com.fjhx.entity.purchase.Purchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-01
  */
-public interface PurchaseMapper extends BaseMapper<Purchase> {
+public interface PurchaseMapper extends MPJJoinMapper<Purchase> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface StockJournalMapper extends BaseMapper<StockJournal> {
+public interface StockJournalMapper extends MPJJoinMapper<StockJournal> {
 
     Page<StockJournal> getPage(@Param("page") Page<StockJournal> page, @Param("ew") IWrapper<StockJournal> wrapper);
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.stock;
 
 import com.fjhx.entity.stock.Stock;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface StockMapper extends BaseMapper<Stock> {
+public interface StockMapper extends MPJJoinMapper<Stock> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/supplier/SupplierMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.supplier;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.supplier.Supplier;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.fjhx.entity.supplier.Supplier;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface SupplierMapper extends BaseMapper<Supplier> {
+public interface SupplierMapper extends MPJJoinMapper<Supplier> {
 
 }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/supplier/SupplierPriceMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.supplier.SupplierPrice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-11-25
  */
-public interface SupplierPriceMapper extends BaseMapper<SupplierPrice> {
+public interface SupplierPriceMapper extends MPJJoinMapper<SupplierPrice> {
 
     Page<SupplierPrice> getPage(@Param("page") Page<SupplierPrice> page, @Param("ew") IWrapper<SupplierPrice> wrapper);
 

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/system/SystemConfigMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.mapper.system;
 
 import com.fjhx.entity.system.SystemConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-12-08
  */
-public interface SystemConfigMapper extends BaseMapper<SystemConfig> {
+public interface SystemConfigMapper extends MPJJoinMapper<SystemConfig> {
 
 }

+ 3 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/warehouse/WarehouseMapper.java

@@ -2,6 +2,8 @@ package com.fjhx.mapper.warehouse;
 
 import com.fjhx.entity.warehouse.Warehouse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -11,6 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface WarehouseMapper extends BaseMapper<Warehouse> {
+public interface WarehouseMapper extends MPJJoinMapper<Warehouse> {
 
 }