diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/controller/NuInvoicingQldInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/controller/NuInvoicingQldInfoController.java index d6092e99..efb41ff7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/controller/NuInvoicingQldInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/controller/NuInvoicingQldInfoController.java @@ -52,7 +52,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class NuInvoicingQldInfoController extends JeecgController { @Autowired private INuInvoicingQldInfoService nuInvoicingQldInfoService; - + /** * 分页列表查询 * @@ -71,10 +71,10 @@ public class NuInvoicingQldInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQldInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = nuInvoicingQldInfoService.page(page, queryWrapper); + IPage pageList = nuInvoicingQldInfoService.pages(page, nuInvoicingQldInfo); return Result.OK(pageList); } - + /** * 添加 * @@ -89,7 +89,7 @@ public class NuInvoicingQldInfoController extends JeecgController { List queryWlInfo(InvoicingQldQueryEntity queryDto); + + IPage pages(Page page, @Param("dto") NuInvoicingQldInfo dto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml index ae2eac4f..6fb7bd0b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml @@ -56,4 +56,41 @@ ORDER BY MAX(info.create_time) DESC + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/INuInvoicingQldInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/INuInvoicingQldInfoService.java index 7fcd56ff..2f2895cf 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/INuInvoicingQldInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/INuInvoicingQldInfoService.java @@ -1,5 +1,8 @@ package com.nu.modules.qld.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.qld.entity.NuInvoicingQldInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface INuInvoicingQldInfoService extends IService { + IPage pages(Page page, NuInvoicingQldInfo dto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/NuInvoicingQldInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/NuInvoicingQldInfoServiceImpl.java index 06b9f44a..bb140ff6 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/NuInvoicingQldInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/NuInvoicingQldInfoServiceImpl.java @@ -1,5 +1,8 @@ package com.nu.modules.qld.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.qld.entity.NuInvoicingQldInfo; import com.nu.modules.qld.mapper.NuInvoicingQldInfoMapper; import com.nu.modules.qld.service.INuInvoicingQldInfoService; @@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class NuInvoicingQldInfoServiceImpl extends ServiceImpl implements INuInvoicingQldInfoService { + @Override + public IPage pages(Page page, NuInvoicingQldInfo dto) { + return baseMapper.pages(page,dto); + } }