From 9515b4e75471cbebbf40638b474cfa8388dd1925 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Wed, 20 Jan 2021 11:44:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A2=84=E4=BB=98=E8=B4=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=B7=B2=E4=BB=98=E8=B4=B9=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=88=87=E6=8D=A2=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9C=AA=E4=BB=98=E8=B4=B9=E7=9A=84=E7=97=85?= =?UTF-8?q?=E6=82=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtPrepaymentDaoController.java | 11 +-- .../fantang/mapper/FtPrepaymentDaoMapper.java | 7 +- .../service/IFtPrepaymentDaoService.java | 5 +- .../impl/FtPrepaymentDaoServiceImpl.java | 13 +++- ruoyi-ui/src/api/fantang/prepayment.js | 6 +- .../src/views/fantang/prepayment/index.vue | 74 +++++++++---------- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java index 377a91b5f..136887145 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java @@ -68,18 +68,15 @@ public class FtPrepaymentDaoController extends BaseController { // 查询所有待缴费列表 @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/listNoPrepay") - public TableDataInfo listNoPrepay() { - startPage(); - List list = iFtPrepaymentDaoService.listNoPrepay(); - return getDataTable(list); + public AjaxResult listNoPrepay(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize) { + return AjaxResult.success(iFtPrepaymentDaoService.listNoPrepay(pageNum, pageSize)); } // 查询所有已缴费列表 @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/listPrepay") - public TableDataInfo listPrepay() { - List list = iFtPrepaymentDaoService.listPrepay(); - return getDataTable(list); + public AjaxResult listPrepay(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize) { + return AjaxResult.success(iFtPrepaymentDaoService.listPrepay(pageNum, pageSize)); } // 查询所有已结算列表 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java index cf945275c..4a25c7fbc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java @@ -1,6 +1,9 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.system.fantang.domain.FtOrderDao; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; import com.ruoyi.system.fantang.domain.FtPrepaymentVo; import org.apache.ibatis.annotations.Select; @@ -16,10 +19,10 @@ import java.util.List; public interface FtPrepaymentDaoMapper extends BaseMapper { @Select("select a.patient_id , a.name, a.hospital_id, a.bed_id, b.depart_name, b.depart_code from ft_patient a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where a.patient_id not in (select patient_id from ft_prepayment )") - List listNoPrepay(); + IPage listNoPrepay(Page page); @Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 0") - List listPrepay(); + IPage listPrepay(Page page); @Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 1") List listAllPrepay(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java index 6a03f98b4..1a821f0af 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; import com.ruoyi.system.fantang.domain.FtPrepaymentVo; @@ -14,9 +15,9 @@ import java.util.List; */ public interface IFtPrepaymentDaoService extends IService { - List listNoPrepay(); + IPage listNoPrepay(Integer pageNum, Integer pageSize); - List listPrepay(); + IPage listPrepay(Integer pageNum, Integer pageSize); List listAllPrepay(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java index 1f3422d93..af9dd0f2d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java @@ -1,7 +1,10 @@ package com.ruoyi.system.fantang.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.fantang.domain.FtOrderDao; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; import com.ruoyi.system.fantang.domain.FtPrepaymentVo; import com.ruoyi.system.fantang.mapper.FtPrepaymentDaoMapper; @@ -20,13 +23,15 @@ import java.util.List; public class FtPrepaymentDaoServiceImpl extends ServiceImpl implements IFtPrepaymentDaoService { @Override - public List listNoPrepay() { - return this.baseMapper.listNoPrepay(); + public IPage listNoPrepay(Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.listNoPrepay(page); } @Override - public List listPrepay() { - return this.baseMapper.listPrepay(); + public IPage listPrepay(Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.listPrepay(page); } @Override diff --git a/ruoyi-ui/src/api/fantang/prepayment.js b/ruoyi-ui/src/api/fantang/prepayment.js index 1c8c63c17..5ad663580 100644 --- a/ruoyi-ui/src/api/fantang/prepayment.js +++ b/ruoyi-ui/src/api/fantang/prepayment.js @@ -1,18 +1,20 @@ import request from '@/utils/request' // 查询所有未缴预付费病人列表 -export function listNoPrepayment() { +export function listNoPrepayment(query) { return request({ url: '/fantang/prepayment/listNoPrepay', method: 'get', + params: query }) } // 查询所有已缴预付费病人列表 -export function listPrepay() { +export function listPrepay(query) { return request({ url: '/fantang/prepayment/listPrepay', method: 'get', + params: query }) } diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index e5c564ced..ddc23c2ec 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -98,12 +98,12 @@ - - - - + + + + + +