diff --git a/pom.xml b/pom.xml index 7888a17..da55549 100644 --- a/pom.xml +++ b/pom.xml @@ -215,10 +215,6 @@ org.mybatis mybatis-spring - - org.springframework.boot - spring-boot-starter-jdbc - diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/config/MyBatisPlusConfig.java b/src/main/java/com/chaozhanggui/system/cashierservice/config/MyBatisPlusConfig.java new file mode 100644 index 0000000..a8c8b60 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/config/MyBatisPlusConfig.java @@ -0,0 +1,15 @@ +package com.chaozhanggui.system.cashierservice.config; + +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MyBatisPlusConfig { + + @Bean + public PaginationInterceptor paginationInterceptor() { + return new PaginationInterceptor(); + } +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopPermission.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopPermission.java index 380a643..4268934 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopPermission.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopPermission.java @@ -122,7 +122,7 @@ public class TbShopPermission extends Model { * @return 主键值 */ @Override - protected Serializable pkVal() { + public Serializable pkVal() { return this.id; } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopStaffPermission.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopStaffPermission.java index 46c4a31..42e87df 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopStaffPermission.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopStaffPermission.java @@ -70,7 +70,7 @@ public class TbShopStaffPermission extends Model { * @return 主键值 */ @Override - protected Serializable pkVal() { + public Serializable pkVal() { return this.id; } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java index 9b3286f..32583b7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java @@ -494,7 +494,8 @@ public class TbCallServiceImpl implements TbCallService { .collect(Collectors.toList()); } - LambdaQueryChainWrapper query = callQueueService.lambdaQuery() + + LambdaQueryWrapper query = new LambdaQueryWrapper() .eq(TbCallQueue::getShopId, shopId) .eq(TbCallQueue::getCreateDay, DateUtil.today()) .in(TbCallQueue::getCallTableId, tableIds); @@ -504,10 +505,10 @@ public class TbCallServiceImpl implements TbCallService { }else { query.in(TbCallQueue::getState, 0, 1); } - Page pageInfo = query - .orderByAsc(TbCallQueue::getCreateTime) - .orderByDesc(TbCallQueue::getState) - .page(new Page<>(page, size)); + + Page pageInfo = callQueueService.page(new Page<>(page, size), + query.orderByAsc(TbCallQueue::getCreateTime) + .orderByDesc(TbCallQueue::getState)); List list1 = pageInfo.getRecords();