From aae95314a9296cc071c9215f0ecdf6541cf64726 Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 18 Dec 2025 14:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=A2=9E=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/pojo/entity/OrderCargoPlaceEntity.java | 2 +- .../dispose/cst/order/pojo/entity/OrderEntity.java | 2 +- .../pojo/entity/OrderExpenseDetailEntity.java | 2 +- .../order/pojo/entity/OrderExpenseItemsEntity.java | 2 +- .../cst/order/pojo/entity/OrderTransEntity.java | 2 +- .../cst/project/pojo/entity/ProjectEntity.java | 2 +- .../cst/station/pojo/entity/StationEntity.java | 2 +- .../constant/ExpenseItemCategory.java | 2 +- .../constant/ExpenseStrategy.java | 2 +- .../finance/{expenseItem => }/constant/Payer.java | 2 +- .../{expenseItem => }/constant/ScopeStrategy.java | 2 +- .../{bill => }/controller/BillController.java | 6 +++--- .../controller/ExpenseItemController.java | 6 +++--- .../controller/MoneyAccountController.java | 6 +++--- .../controller/MoneyFlowController.java | 6 +++--- .../finance/{bill => }/mapper/BillMapper.java | 4 ++-- .../mapper/ExpenseItemMapper.java | 4 ++-- .../mapper/MoneyAccountMapper.java | 4 ++-- .../{moneyFlow => }/mapper/MoneyFlowMapper.java | 4 ++-- .../finance/{bill => }/pojo/entity/BillEntity.java | 4 ++-- .../pojo/entity/ExpenseItemEntity.java | 10 +++++----- .../pojo/entity/MoneyAccountEntity.java | 4 ++-- .../pojo/entity/MoneyFlowEntity.java | 4 ++-- .../finance/{bill => }/service/BillService.java | 4 ++-- .../service/ExpenseItemService.java | 4 ++-- .../service/MoneyAccountService.java | 4 ++-- .../{moneyFlow => }/service/MoneyFlowService.java | 4 ++-- .../{bill => }/service/impl/BillServiceImpl.java | 8 ++++---- .../service/impl/ExpenseItemServiceImpl.java | 8 ++++---- .../service/impl/MoneyAccountServiceImpl.java | 8 ++++---- .../service/impl/MoneyFlowServiceImpl.java | 8 ++++---- .../controller/GoodsCategoryController.java | 6 +++--- .../{goods => }/controller/GoodsController.java | 6 +++--- .../mapper/GoodsCategoryMapper.java | 4 ++-- .../goods/{goods => }/mapper/GoodsMapper.java | 4 ++-- .../pojo/entity/GoodsCategoryEntity.java | 4 ++-- .../goods/{goods => }/pojo/entity/GoodsEntity.java | 6 +++--- .../service/GoodsCategoryService.java | 4 ++-- .../goods/{goods => }/service/GoodsService.java | 4 ++-- .../service/impl/GoodsCategoryServiceImpl.java | 8 ++++---- .../{goods => }/service/impl/GoodsServiceImpl.java | 14 +++++++------- .../OrderCargoPlaceMapper.xml | 0 .../OrderExpenseDetailMapper.xml | 0 .../OrderExpenseItemsMapper.xml | 0 .../mapper/{cst => }/order/OrderMapper.xml | 0 .../{cst/orderTrans => order}/OrderTransMapper.xml | 0 46 files changed, 96 insertions(+), 96 deletions(-) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/constant/ExpenseItemCategory.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/constant/ExpenseStrategy.java (89%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/constant/Payer.java (89%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/constant/ScopeStrategy.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{bill => }/controller/BillController.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/controller/ExpenseItemController.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyAccount => }/controller/MoneyAccountController.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyFlow => }/controller/MoneyFlowController.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{bill => }/mapper/BillMapper.java (64%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/mapper/ExpenseItemMapper.java (62%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyAccount => }/mapper/MoneyAccountMapper.java (62%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyFlow => }/mapper/MoneyFlowMapper.java (62%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{bill => }/pojo/entity/BillEntity.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/pojo/entity/ExpenseItemEntity.java (91%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyAccount => }/pojo/entity/MoneyAccountEntity.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyFlow => }/pojo/entity/MoneyFlowEntity.java (90%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{bill => }/service/BillService.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/service/ExpenseItemService.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyAccount => }/service/MoneyAccountService.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyFlow => }/service/MoneyFlowService.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{bill => }/service/impl/BillServiceImpl.java (85%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{expenseItem => }/service/impl/ExpenseItemServiceImpl.java (83%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyAccount => }/service/impl/MoneyAccountServiceImpl.java (83%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/{moneyFlow => }/service/impl/MoneyFlowServiceImpl.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goodscategory => }/controller/GoodsCategoryController.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goods => }/controller/GoodsController.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goodscategory => }/mapper/GoodsCategoryMapper.java (62%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goods => }/mapper/GoodsMapper.java (64%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goodscategory => }/pojo/entity/GoodsCategoryEntity.java (91%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goods => }/pojo/entity/GoodsEntity.java (89%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goodscategory => }/service/GoodsCategoryService.java (81%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goods => }/service/GoodsService.java (81%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goodscategory => }/service/impl/GoodsCategoryServiceImpl.java (82%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/{goods => }/service/impl/GoodsServiceImpl.java (85%) rename njzscloud-svr/src/main/resources/mapper/{cst/orderCargoPlace => order}/OrderCargoPlaceMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{cst/orderExpenseDetail => order}/OrderExpenseDetailMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{cst/orderExpenseItems => order}/OrderExpenseItemsMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{cst => }/order/OrderMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{cst/orderTrans => order}/OrderTransMapper.xml (100%) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java index 4483974..ef93dfe 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Setter @ToString @Accessors(chain = true) -@TableName("cst_order_cargo_place") +@TableName(value = "cst_order_cargo_place", autoResultMap = true) public class OrderCargoPlaceEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java index 0955163..b601de4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -@TableName("cst_order") +@TableName(value = "cst_order", autoResultMap = true) public class OrderEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java index 9ef8417..277a835 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; @Setter @ToString @Accessors(chain = true) -@TableName("cst_order_expense_detail") +@TableName(value = "cst_order_expense_detail", autoResultMap = true) public class OrderExpenseDetailEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java index 4410f97..e5011a6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; @Setter @ToString @Accessors(chain = true) -@TableName("cst_order_expense_items") +@TableName(value = "cst_order_expense_items", autoResultMap = true) public class OrderExpenseItemsEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java index 1517c04..4dd7ee2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -@TableName("cst_order_trans") +@TableName(value = "cst_order_trans", autoResultMap = true) public class OrderTransEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java index 98c4328..cd5b95d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java @@ -20,7 +20,7 @@ import java.time.LocalDate; @Setter @ToString @Accessors(chain = true) -@TableName("cst_project") +@TableName(value = "cst_project", autoResultMap = true) public class ProjectEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java index 8aad912..bb81462 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @Setter @ToString @Accessors(chain = true) -@TableName("cst_station") +@TableName(value = "cst_station", autoResultMap = true) public class StationEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseItemCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseItemCategory.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseItemCategory.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseItemCategory.java index 1d12f27..e37e7c3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseItemCategory.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseItemCategory.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.expenseItem.constant; +package com.njzscloud.dispose.finance.constant; import com.njzscloud.common.core.ienum.DictStr; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseStrategy.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseStrategy.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseStrategy.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseStrategy.java index c5227fe..522491a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ExpenseStrategy.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseStrategy.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.expenseItem.constant; +package com.njzscloud.dispose.finance.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/Payer.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/Payer.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/Payer.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/Payer.java index ec63ad2..4a15caa 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/Payer.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/Payer.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.expenseItem.constant; +package com.njzscloud.dispose.finance.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ScopeStrategy.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ScopeStrategy.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ScopeStrategy.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ScopeStrategy.java index a7dd109..b229a6e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/constant/ScopeStrategy.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ScopeStrategy.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.expenseItem.constant; +package com.njzscloud.dispose.finance.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/controller/BillController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/BillController.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/controller/BillController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/BillController.java index 29f3375..a278612 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/controller/BillController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/BillController.java @@ -1,10 +1,10 @@ -package com.njzscloud.dispose.finance.bill.controller; +package com.njzscloud.dispose.finance.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity; -import com.njzscloud.dispose.finance.bill.service.BillService; +import com.njzscloud.dispose.finance.pojo.entity.BillEntity; +import com.njzscloud.dispose.finance.service.BillService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/controller/ExpenseItemController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/ExpenseItemController.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/controller/ExpenseItemController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/ExpenseItemController.java index 6399439..95a13da 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/controller/ExpenseItemController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/ExpenseItemController.java @@ -1,10 +1,10 @@ -package com.njzscloud.dispose.finance.expenseItem.controller; +package com.njzscloud.dispose.finance.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; -import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService; +import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.service.ExpenseItemService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/controller/MoneyAccountController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyAccountController.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/controller/MoneyAccountController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyAccountController.java index c8df549..7cde6d1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/controller/MoneyAccountController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyAccountController.java @@ -1,10 +1,10 @@ -package com.njzscloud.dispose.finance.moneyAccount.controller; +package com.njzscloud.dispose.finance.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity; -import com.njzscloud.dispose.finance.moneyAccount.service.MoneyAccountService; +import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity; +import com.njzscloud.dispose.finance.service.MoneyAccountService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/controller/MoneyFlowController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyFlowController.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/controller/MoneyFlowController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyFlowController.java index 9e9ba00..0cb0c6a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/controller/MoneyFlowController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyFlowController.java @@ -1,10 +1,10 @@ -package com.njzscloud.dispose.finance.moneyFlow.controller; +package com.njzscloud.dispose.finance.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity; -import com.njzscloud.dispose.finance.moneyFlow.service.MoneyFlowService; +import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity; +import com.njzscloud.dispose.finance.service.MoneyFlowService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/mapper/BillMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/BillMapper.java similarity index 64% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/mapper/BillMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/BillMapper.java index 78b4ffc..8e1f837 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/mapper/BillMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/BillMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.dispose.finance.bill.mapper; +package com.njzscloud.dispose.finance.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity; +import com.njzscloud.dispose.finance.pojo.entity.BillEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/mapper/ExpenseItemMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/ExpenseItemMapper.java similarity index 62% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/mapper/ExpenseItemMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/ExpenseItemMapper.java index 6d0a9c1..3f795c7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/mapper/ExpenseItemMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/ExpenseItemMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.dispose.finance.expenseItem.mapper; +package com.njzscloud.dispose.finance.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/mapper/MoneyAccountMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyAccountMapper.java similarity index 62% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/mapper/MoneyAccountMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyAccountMapper.java index cf9f81b..435cc04 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/mapper/MoneyAccountMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyAccountMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.dispose.finance.moneyAccount.mapper; +package com.njzscloud.dispose.finance.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity; +import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/mapper/MoneyFlowMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyFlowMapper.java similarity index 62% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/mapper/MoneyFlowMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyFlowMapper.java index 1851277..81fdff0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/mapper/MoneyFlowMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyFlowMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.dispose.finance.moneyFlow.mapper; +package com.njzscloud.dispose.finance.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity; +import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/pojo/entity/BillEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/BillEntity.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/pojo/entity/BillEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/BillEntity.java index b008b08..96a86f0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/pojo/entity/BillEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/BillEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.bill.pojo.entity; +package com.njzscloud.dispose.finance.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; @@ -18,7 +18,7 @@ import java.time.LocalDate; @Setter @ToString @Accessors(chain = true) -@TableName("fin_bill") +@TableName(value = "fin_bill", autoResultMap = true) public class BillEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/ExpenseItemEntity.java similarity index 91% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/ExpenseItemEntity.java index 90d6286..cbdf3d4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/ExpenseItemEntity.java @@ -1,13 +1,13 @@ -package com.njzscloud.dispose.finance.expenseItem.pojo.entity; +package com.njzscloud.dispose.finance.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; -import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseItemCategory; -import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseStrategy; -import com.njzscloud.dispose.finance.expenseItem.constant.Payer; +import com.njzscloud.dispose.finance.constant.ExpenseItemCategory; +import com.njzscloud.dispose.finance.constant.ExpenseStrategy; +import com.njzscloud.dispose.finance.constant.Payer; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -24,7 +24,7 @@ import java.math.BigDecimal; @Setter @ToString @Accessors(chain = true) -@TableName("fin_expense_item") +@TableName(value = "fin_expense_item", autoResultMap = true) public class ExpenseItemEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/pojo/entity/MoneyAccountEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyAccountEntity.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/pojo/entity/MoneyAccountEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyAccountEntity.java index b8a369b..f872bd8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/pojo/entity/MoneyAccountEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyAccountEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.moneyAccount.pojo.entity; +package com.njzscloud.dispose.finance.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; @@ -17,7 +17,7 @@ import java.math.BigDecimal; @Setter @ToString @Accessors(chain = true) -@TableName("fin_money_account") +@TableName(value = "fin_money_account", autoResultMap = true) public class MoneyAccountEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/pojo/entity/MoneyFlowEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyFlowEntity.java similarity index 90% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/pojo/entity/MoneyFlowEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyFlowEntity.java index 230c4c3..e8db437 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/pojo/entity/MoneyFlowEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyFlowEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.finance.moneyFlow.pojo.entity; +package com.njzscloud.dispose.finance.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; @@ -17,7 +17,7 @@ import java.math.BigDecimal; @Setter @ToString @Accessors(chain = true) -@TableName("fin_money_flow") +@TableName(value = "fin_money_flow", autoResultMap = true) public class MoneyFlowEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/BillService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/BillService.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/BillService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/BillService.java index 4345ff0..294763a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/BillService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/BillService.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.finance.bill.service; +package com.njzscloud.dispose.finance.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity; +import com.njzscloud.dispose.finance.pojo.entity.BillEntity; import java.util.List; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/ExpenseItemService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/ExpenseItemService.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/ExpenseItemService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/ExpenseItemService.java index efc8295..f8392a7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/ExpenseItemService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/ExpenseItemService.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.finance.expenseItem.service; +package com.njzscloud.dispose.finance.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity; import java.util.List; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/MoneyAccountService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyAccountService.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/MoneyAccountService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyAccountService.java index ccde48b..4f4280d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/MoneyAccountService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyAccountService.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.finance.moneyAccount.service; +package com.njzscloud.dispose.finance.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity; +import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity; import java.util.List; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/MoneyFlowService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyFlowService.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/MoneyFlowService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyFlowService.java index 62c5674..f1e536f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/MoneyFlowService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyFlowService.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.finance.moneyFlow.service; +package com.njzscloud.dispose.finance.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity; +import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity; import java.util.List; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/impl/BillServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/BillServiceImpl.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/impl/BillServiceImpl.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/BillServiceImpl.java index 7b2289b..24ee959 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/impl/BillServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/BillServiceImpl.java @@ -1,12 +1,12 @@ -package com.njzscloud.dispose.finance.bill.service.impl; +package com.njzscloud.dispose.finance.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.bill.mapper.BillMapper; -import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity; -import com.njzscloud.dispose.finance.bill.service.BillService; +import com.njzscloud.dispose.finance.mapper.BillMapper; +import com.njzscloud.dispose.finance.pojo.entity.BillEntity; +import com.njzscloud.dispose.finance.service.BillService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/impl/ExpenseItemServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/ExpenseItemServiceImpl.java similarity index 83% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/impl/ExpenseItemServiceImpl.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/ExpenseItemServiceImpl.java index 90bd2d7..1ff0f7e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/impl/ExpenseItemServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/ExpenseItemServiceImpl.java @@ -1,12 +1,12 @@ -package com.njzscloud.dispose.finance.expenseItem.service.impl; +package com.njzscloud.dispose.finance.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.expenseItem.mapper.ExpenseItemMapper; -import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; -import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService; +import com.njzscloud.dispose.finance.mapper.ExpenseItemMapper; +import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.service.ExpenseItemService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/impl/MoneyAccountServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyAccountServiceImpl.java similarity index 83% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/impl/MoneyAccountServiceImpl.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyAccountServiceImpl.java index 0c68c78..b3ebfa0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/impl/MoneyAccountServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyAccountServiceImpl.java @@ -1,12 +1,12 @@ -package com.njzscloud.dispose.finance.moneyAccount.service.impl; +package com.njzscloud.dispose.finance.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.moneyAccount.mapper.MoneyAccountMapper; -import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity; -import com.njzscloud.dispose.finance.moneyAccount.service.MoneyAccountService; +import com.njzscloud.dispose.finance.mapper.MoneyAccountMapper; +import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity; +import com.njzscloud.dispose.finance.service.MoneyAccountService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/impl/MoneyFlowServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyFlowServiceImpl.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/impl/MoneyFlowServiceImpl.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyFlowServiceImpl.java index e7f663e..81583ef 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/impl/MoneyFlowServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyFlowServiceImpl.java @@ -1,12 +1,12 @@ -package com.njzscloud.dispose.finance.moneyFlow.service.impl; +package com.njzscloud.dispose.finance.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.moneyFlow.mapper.MoneyFlowMapper; -import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity; -import com.njzscloud.dispose.finance.moneyFlow.service.MoneyFlowService; +import com.njzscloud.dispose.finance.mapper.MoneyFlowMapper; +import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity; +import com.njzscloud.dispose.finance.service.MoneyFlowService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/controller/GoodsCategoryController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsCategoryController.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/controller/GoodsCategoryController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsCategoryController.java index ce13715..5c96923 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/controller/GoodsCategoryController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsCategoryController.java @@ -1,10 +1,10 @@ -package com.njzscloud.dispose.goods.goodscategory.controller; +package com.njzscloud.dispose.goods.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity; -import com.njzscloud.dispose.goods.goodscategory.service.GoodsCategoryService; +import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity; +import com.njzscloud.dispose.goods.service.GoodsCategoryService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/controller/GoodsController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/controller/GoodsController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java index fe16196..c44e3b7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/controller/GoodsController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java @@ -1,10 +1,10 @@ -package com.njzscloud.dispose.goods.goods.controller; +package com.njzscloud.dispose.goods.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity; -import com.njzscloud.dispose.goods.goods.service.GoodsService; +import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity; +import com.njzscloud.dispose.goods.service.GoodsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/mapper/GoodsCategoryMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsCategoryMapper.java similarity index 62% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/mapper/GoodsCategoryMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsCategoryMapper.java index e7355f9..6439ef3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/mapper/GoodsCategoryMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsCategoryMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.dispose.goods.goodscategory.mapper; +package com.njzscloud.dispose.goods.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity; +import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/mapper/GoodsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java similarity index 64% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/mapper/GoodsMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java index 09444de..776bd98 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/mapper/GoodsMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.dispose.goods.goods.mapper; +package com.njzscloud.dispose.goods.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity; +import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsCategoryEntity.java similarity index 91% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsCategoryEntity.java index d2f7ae4..11c8d1d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsCategoryEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.dispose.goods.goodscategory.pojo.entity; +package com.njzscloud.dispose.goods.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @Setter @ToString @Accessors(chain = true) -@TableName("gds_goods_category") +@TableName(value = "gds_goods_category", autoResultMap = true) public class GoodsCategoryEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsEntity.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsEntity.java index 92f61d6..28eb576 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsEntity.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.goods.goods.pojo.entity; +package com.njzscloud.dispose.goods.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; -import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; @Setter @ToString @Accessors(chain = true) -@TableName("gds_goods") +@TableName(value = "gds_goods", autoResultMap = true) public class GoodsEntity extends BaseEntity { /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/GoodsCategoryService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsCategoryService.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/GoodsCategoryService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsCategoryService.java index 4b52d81..247e08a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/GoodsCategoryService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsCategoryService.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.goods.goodscategory.service; +package com.njzscloud.dispose.goods.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity; +import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity; import java.util.List; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/GoodsService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/GoodsService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java index 71e1521..3807223 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/GoodsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java @@ -1,9 +1,9 @@ -package com.njzscloud.dispose.goods.goods.service; +package com.njzscloud.dispose.goods.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity; +import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity; import java.util.List; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/impl/GoodsCategoryServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsCategoryServiceImpl.java similarity index 82% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/impl/GoodsCategoryServiceImpl.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsCategoryServiceImpl.java index 7808a8c..608742a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/impl/GoodsCategoryServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsCategoryServiceImpl.java @@ -1,12 +1,12 @@ -package com.njzscloud.dispose.goods.goodscategory.service.impl; +package com.njzscloud.dispose.goods.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.goods.goodscategory.mapper.GoodsCategoryMapper; -import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity; -import com.njzscloud.dispose.goods.goodscategory.service.GoodsCategoryService; +import com.njzscloud.dispose.goods.mapper.GoodsCategoryMapper; +import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity; +import com.njzscloud.dispose.goods.service.GoodsCategoryService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java index 4d2aa61..bc4a5be 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java @@ -1,16 +1,16 @@ -package com.njzscloud.dispose.goods.goods.service.impl; +package com.njzscloud.dispose.goods.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseItemCategory; -import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; -import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService; -import com.njzscloud.dispose.goods.goods.mapper.GoodsMapper; -import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity; -import com.njzscloud.dispose.goods.goods.service.GoodsService; +import com.njzscloud.dispose.finance.constant.ExpenseItemCategory; +import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.service.ExpenseItemService; +import com.njzscloud.dispose.goods.mapper.GoodsMapper; +import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity; +import com.njzscloud.dispose.goods.service.GoodsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderCargoPlaceMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml rename to njzscloud-svr/src/main/resources/mapper/order/OrderCargoPlaceMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderExpenseDetailMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml rename to njzscloud-svr/src/main/resources/mapper/order/OrderExpenseDetailMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderExpenseItemsMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml rename to njzscloud-svr/src/main/resources/mapper/order/OrderExpenseItemsMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml rename to njzscloud-svr/src/main/resources/mapper/order/OrderMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderTransMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml rename to njzscloud-svr/src/main/resources/mapper/order/OrderTransMapper.xml