From f248b7d4af3893efd3356a7840874879ec06ac6f Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Mon, 30 Nov 2020 11:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E4=BB=98=E8=B4=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E7=BB=93=E7=AE=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtPrepaymentDaoController.java | 53 +++++--- ...PrepaymentDao.java => FtPrepaymentVo.java} | 2 +- .../fantang/mapper/FtPrepaymentDaoMapper.java | 13 +- .../service/IFtPrepaymentDaoService.java | 11 +- .../impl/FtPrepaymentDaoServiceImpl.java | 17 ++- .../mapper/fantang/FtPrepaymentDaoMapper.xml | 2 +- ruoyi-ui/src/api/fantang/prepayment.js | 18 ++- .../src/views/fantang/prepayment/index.vue | 113 ++++++++++++------ 8 files changed, 158 insertions(+), 71 deletions(-) rename ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/{FtPrepaymentDao.java => FtPrepaymentVo.java} (97%) 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 e257fcdb5..8a082fb7a 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 @@ -8,9 +8,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.fantang.domain.FtPrepaymentDao; +import com.ruoyi.system.fantang.domain.FtPrepaymentVo; import com.ruoyi.system.fantang.service.IFtPrepaymentDaoService; -import com.ruoyi.system.fantang.vo.FtPrepaymentVo; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -35,8 +34,23 @@ public class FtPrepaymentDaoController extends BaseController { // 查询所有待缴费列表 @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/listNoPrepay") - public TableDataInfo listNoPrepay(FtPrepaymentDao ftPrepaymentDao) { - List list = iFtPrepaymentDaoService.listNoPrepay(); + public TableDataInfo listNoPrepay() { + List list = iFtPrepaymentDaoService.listNoPrepay(); + return getDataTable(list); + } + + // 查询所有已缴费列表 + @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") + @GetMapping("/listPrepay") + public TableDataInfo listPrepay() { + List list = iFtPrepaymentDaoService.listPrepay(); + return getDataTable(list); + } + // 查询所有已结算列表 + @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") + @GetMapping("/listAllPrepay") + public TableDataInfo listAllPrepay() { + List list = iFtPrepaymentDaoService.listAllPrepay(); return getDataTable(list); } @@ -46,25 +60,28 @@ public class FtPrepaymentDaoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/list") - public TableDataInfo list(FtPrepaymentDao ftPrepaymentDao) { + public TableDataInfo list(FtPrepaymentVo ftPrepaymentDao) { startPage(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftPrepaymentDao); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftPrepaymentDao); if (ftPrepaymentDao.getCollectAt() != null) { - lqw.eq(FtPrepaymentDao::getCollectAt, ftPrepaymentDao.getCollectAt()); + lqw.eq(FtPrepaymentVo::getCollectAt, ftPrepaymentDao.getCollectAt()); } if (ftPrepaymentDao.getSettlementAt() != null) { - lqw.eq(FtPrepaymentDao::getSettlementAt, ftPrepaymentDao.getSettlementAt()); + lqw.eq(FtPrepaymentVo::getSettlementAt, ftPrepaymentDao.getSettlementAt()); } if (ftPrepaymentDao.getSettlementFlag() != null) { - lqw.eq(FtPrepaymentDao::getSettlementFlag, ftPrepaymentDao.getSettlementFlag()); + lqw.eq(FtPrepaymentVo::getSettlementFlag, ftPrepaymentDao.getSettlementFlag()); } if (ftPrepaymentDao.getPrepaid() != null) { - lqw.eq(FtPrepaymentDao::getPrepaid, ftPrepaymentDao.getPrepaid()); + lqw.eq(FtPrepaymentVo::getPrepaid, ftPrepaymentDao.getPrepaid()); } if (ftPrepaymentDao.getPrepaidAt() != null) { - lqw.eq(FtPrepaymentDao::getPrepaidAt, ftPrepaymentDao.getPrepaidAt()); + lqw.eq(FtPrepaymentVo::getPrepaidAt, ftPrepaymentDao.getPrepaidAt()); } - List list = iFtPrepaymentDaoService.list(lqw); + if (ftPrepaymentDao.getPrepaidAt() != null) { + lqw.eq(FtPrepaymentVo::getPrepaidAt, ftPrepaymentDao.getPrepaidAt()); + } + List list = iFtPrepaymentDaoService.list(lqw); return getDataTable(list); } @@ -74,10 +91,10 @@ public class FtPrepaymentDaoController extends BaseController { @PreAuthorize("@ss.hasPermi('fantang:prepayment:export')") @Log(title = "收费管理", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(FtPrepaymentDao ftPrepaymentDao) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftPrepaymentDao); - List list = iFtPrepaymentDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtPrepaymentDao.class); + public AjaxResult export(FtPrepaymentVo ftPrepaymentDao) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftPrepaymentDao); + List list = iFtPrepaymentDaoService.list(lqw); + ExcelUtil util = new ExcelUtil(FtPrepaymentVo.class); return util.exportExcel(list, "prepayment"); } @@ -96,7 +113,7 @@ public class FtPrepaymentDaoController extends BaseController { @PreAuthorize("@ss.hasPermi('fantang:prepayment:add')") @Log(title = "收费管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody FtPrepaymentDao ftPrepaymentDao) { + public AjaxResult add(@RequestBody FtPrepaymentVo ftPrepaymentDao) { return toAjax(iFtPrepaymentDaoService.save(ftPrepaymentDao) ? 1 : 0); } @@ -106,7 +123,7 @@ public class FtPrepaymentDaoController extends BaseController { @PreAuthorize("@ss.hasPermi('fantang:prepayment:edit')") @Log(title = "收费管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody FtPrepaymentDao ftPrepaymentDao) { + public AjaxResult edit(@RequestBody FtPrepaymentVo ftPrepaymentDao) { return toAjax(iFtPrepaymentDaoService.updateById(ftPrepaymentDao) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java rename to ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java index 095e88864..69cb87c82 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java @@ -26,7 +26,7 @@ import java.util.Date; @NoArgsConstructor @Accessors(chain = true) @TableName("ft_prepayment") -public class FtPrepaymentDao implements Serializable { +public class FtPrepaymentVo implements Serializable { private static final long serialVersionUID = 1L; 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 b83fc2247..17b898219 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,8 +1,7 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.system.fantang.domain.FtPrepaymentDao; -import com.ruoyi.system.fantang.vo.FtPrepaymentVo; +import com.ruoyi.system.fantang.domain.FtPrepaymentVo; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -13,8 +12,14 @@ import java.util.List; * @author ft * @date 2020-11-19 */ -public interface FtPrepaymentDaoMapper extends BaseMapper { +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 )") - public List listNoPrepay(); + public List listNoPrepay(); + + @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(); + + @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 779291850..989081eeb 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,8 +1,7 @@ package com.ruoyi.system.fantang.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.system.fantang.domain.FtPrepaymentDao; -import com.ruoyi.system.fantang.vo.FtPrepaymentVo; +import com.ruoyi.system.fantang.domain.FtPrepaymentVo; import java.util.List; @@ -12,7 +11,11 @@ import java.util.List; * @author ft * @date 2020-11-19 */ -public interface IFtPrepaymentDaoService extends IService { +public interface IFtPrepaymentDaoService extends IService { - List listNoPrepay(); + List listNoPrepay(); + + List listPrepay(); + + 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 9f91c46c5..8e98bd648 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,10 +1,9 @@ package com.ruoyi.system.fantang.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.system.fantang.domain.FtPrepaymentDao; +import com.ruoyi.system.fantang.domain.FtPrepaymentVo; import com.ruoyi.system.fantang.mapper.FtPrepaymentDaoMapper; import com.ruoyi.system.fantang.service.IFtPrepaymentDaoService; -import com.ruoyi.system.fantang.vo.FtPrepaymentVo; import org.springframework.stereotype.Service; import java.util.List; @@ -16,10 +15,20 @@ import java.util.List; * @date 2020-11-19 */ @Service -public class FtPrepaymentDaoServiceImpl extends ServiceImpl implements IFtPrepaymentDaoService { +public class FtPrepaymentDaoServiceImpl extends ServiceImpl implements IFtPrepaymentDaoService { @Override - public List listNoPrepay() { + public List listNoPrepay() { return this.baseMapper.listNoPrepay(); } + + @Override + public List listPrepay() { + return this.baseMapper.listPrepay(); + } + + @Override + public List listAllPrepay() { + return this.baseMapper.listAllPrepay(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml index 919bf8e48..58dce5a7d 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-ui/src/api/fantang/prepayment.js b/ruoyi-ui/src/api/fantang/prepayment.js index e1d76febe..56ec26d00 100644 --- a/ruoyi-ui/src/api/fantang/prepayment.js +++ b/ruoyi-ui/src/api/fantang/prepayment.js @@ -1,8 +1,5 @@ import request from '@/utils/request' - - - // 查询所有未缴预付费病人列表 export function listNoPrepayment() { return request({ @@ -10,6 +7,21 @@ export function listNoPrepayment() { method: 'get', }) } +// 查询所有已缴预付费病人列表 +export function listPrepay() { + return request({ + url: '/fantang/prepayment/listPrepay', + method: 'get', + }) +} + +// 查询所有已结算 +export function listAllPrepay() { + return request({ + url: '/fantang/prepayment/listAllPrepay', + method: 'get', + }) +} diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 00d2f49b1..69a1e23e8 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -1,31 +1,34 @@