diff --git a/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java b/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java index ac98339..abccc0b 100644 --- a/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java +++ b/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java @@ -63,7 +63,11 @@ public class CatchPalletController { @PathVariable("size") Integer size, @RequestBody CatchPallet pallet) { IPage page = catchPalletService.queryPage(no,size,pallet); - return R.ok().put("rows", page.getRecords()).put("total", page.getTotal()); + int total = catchPalletService.queryPalletTotal(pallet); + return R.ok() + .put("rows", page.getRecords()) + .put("total", page.getTotal()) + .put("palletTotal",total); } diff --git a/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java b/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java index 14e04b4..ed9039a 100644 --- a/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java +++ b/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java @@ -9,4 +9,6 @@ import java.util.List; @Mapper public interface CatchPalletMapper extends BaseMapper { int saveBatch(List catchPalletList); + + int queryPalletTotal(CatchPallet pallet); } diff --git a/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java b/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java index 5cc5c9f..43d622c 100644 --- a/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java +++ b/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java @@ -20,4 +20,6 @@ public interface CatchPalletService extends IService { void removeAllCatchPallet(CatchPallet pallet); void saveCatchPalletBatch(List palletList); + + int queryPalletTotal(CatchPallet pallet); } diff --git a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java index 9e60079..35fefbc 100644 --- a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java @@ -144,4 +144,9 @@ public class CatchPalletServiceImpl extends ServiceImpl + +