diff --git a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java index 80b55fd..bc86c38 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java @@ -232,4 +232,25 @@ public class RkInfoController extends BaseController List list = rkInfoService.selectDeliveryAll(query); return AjaxResult.success(list); } + + /** + * 分页查询 rk_info 所有明细 + * @param + * @return + */ + @PostMapping("/page") + public TableDataInfo page(@RequestBody(required = false) RkInfoQueryDTO dto) { + + if (dto == null) { + dto = new RkInfoQueryDTO(); + } + + // 使用 PageHelper 分页 + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + + List list = rkInfoService.selectAllRkInfo(dto); + + return getDataTable(list); + } + } diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java index d523d06..a86bf69 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java @@ -501,7 +501,7 @@ public class RkInfo extends BaseEntity .append("isChuku", getIsChuku()) .append("billNo", getBillNo()) .append("billNoCk", getBillNoCk()) - .append("isDelivery", getBillNoCk()) + .append("isDelivery", getIsDelivery()) .append("remark", getRemark()) .append("xj", getXj()) .append("xmNo", getXmNo()) diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java index 1a177c9..4670697 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java @@ -228,4 +228,10 @@ public interface RkInfoMapper * @return */ List selectDeliveryAll(RkInfo query); + + + /** + * 查询 rk_info 全量明细(仅未删除) + */ + List selectAllRkInfo(RkInfo query); } diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java index e0ce161..b9bff7c 100644 --- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java +++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java @@ -161,4 +161,10 @@ public interface IRkInfoService * @return */ List selectDeliveryAll(RkInfo query); + + /** + * 分页查询 rk_info 所有明细(仅未删除) + */ + List selectAllRkInfo(RkInfo query); + } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java index ddc37fc..711426c 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java @@ -993,4 +993,9 @@ public class RkInfoServiceImpl implements IRkInfoService public List selectDeliveryAll(RkInfo query) { return rkInfoMapper.selectDeliveryAll(query); } + + @Override + public List selectAllRkInfo(RkInfo query) { + return rkInfoMapper.selectAllRkInfo(query); + } } diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 9f65622..bf1862c 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -945,5 +945,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY ri.ly_time DESC, ri.id DESC + + \ No newline at end of file