From 63e2052b9a120df7b1a1088806b111d40806546f Mon Sep 17 00:00:00 2001 From: "28353131@qq.com" <28353131@qq.com> Date: Sun, 29 Nov 2020 16:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E5=AE=9E=E7=8E=B0=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=BB=BA=E8=AE=AE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtPrepaymentDaoController.java | 10 ++ .../fantang/mapper/FtPrepaymentDaoMapper.java | 6 + .../service/IFtPrepaymentDaoService.java | 4 + .../impl/FtPrepaymentDaoServiceImpl.java | 7 ++ .../system/fantang/vo/FtPrepaymentVo.java | 106 ++++++++++++++++++ ruoyi-ui/src/api/fantang/prepayment.js | 15 ++- .../src/views/fantang/prepayment/index.vue | 36 ++++-- 7 files changed, 174 insertions(+), 10 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java 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 088a55266..e257fcdb5 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 @@ -10,6 +10,7 @@ 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.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; @@ -31,6 +32,15 @@ public class FtPrepaymentDaoController extends BaseController { private final IFtPrepaymentDaoService iFtPrepaymentDaoService; + // 查询所有待缴费列表 + @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") + @GetMapping("/listNoPrepay") + public TableDataInfo listNoPrepay(FtPrepaymentDao ftPrepaymentDao) { + List list = iFtPrepaymentDaoService.listNoPrepay(); + return getDataTable(list); + } + + /** * 查询收费管理列表 */ 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 3b34423d9..b83fc2247 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 @@ -2,6 +2,10 @@ 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 org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 收费管理Mapper接口 @@ -11,4 +15,6 @@ import com.ruoyi.system.fantang.domain.FtPrepaymentDao; */ 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(); } 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 c6c0db615..779291850 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 @@ -2,6 +2,9 @@ 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 java.util.List; /** * 收费管理Service接口 @@ -11,4 +14,5 @@ import com.ruoyi.system.fantang.domain.FtPrepaymentDao; */ public interface IFtPrepaymentDaoService extends IService { + List listNoPrepay(); } 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 c808f2cb1..9f91c46c5 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 @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; 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; + /** * 收费管理Service业务层处理 * @@ -15,4 +18,8 @@ import org.springframework.stereotype.Service; @Service public class FtPrepaymentDaoServiceImpl extends ServiceImpl implements IFtPrepaymentDaoService { + @Override + public List listNoPrepay() { + return this.baseMapper.listNoPrepay(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java new file mode 100644 index 000000000..ebd2d80af --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java @@ -0,0 +1,106 @@ +package com.ruoyi.system.fantang.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 收费管理对象 ft_prepayment + * + * @author ft + * @date 2020-11-19 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("ft_prepayment") +public class FtPrepaymentVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * select a.patient_id , a.name, a.hospital_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 ) + */ + private String name; + + private String bedId; + + private String departName; + + private String hospitalId; + + private String departCode; + + /** + * 预付费id + */ + @TableId(value = "prepayment_id") + private Long prepaymentId; + + /** + * 病人id + */ + private Long patientId; + + /** + * 收款时间 + */ + @Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date collectAt; + + /** + * 收款员 + */ + private Long collectBy; + + /** + * 结算时间 + */ + @Excel(name = "结算时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date settlementAt; + + /** + * 结算员 + */ + private Long settlementBy; + + /** + * 结算报表id + */ + private Long settlementId; + + /** + * 结算标志 + */ + @Excel(name = "结算标志") + private Long settlementFlag; + + /** + * 预付费金额 + */ + @Excel(name = "预付费金额") + private BigDecimal prepaid; + + /** + * 预付费时间 + */ + @Excel(name = "预付费时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date prepaidAt; +} diff --git a/ruoyi-ui/src/api/fantang/prepayment.js b/ruoyi-ui/src/api/fantang/prepayment.js index 083dd12b9..e1d76febe 100644 --- a/ruoyi-ui/src/api/fantang/prepayment.js +++ b/ruoyi-ui/src/api/fantang/prepayment.js @@ -1,5 +1,18 @@ import request from '@/utils/request' + + + +// 查询所有未缴预付费病人列表 +export function listNoPrepayment() { + return request({ + url: '/fantang/prepayment/listNoPrepay', + method: 'get', + }) +} + + + // 查询收费管理列表 export function listPrepayment(query) { return request({ @@ -50,4 +63,4 @@ export function exportPrepayment(query) { method: 'get', params: query }) -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 264beff69..0ce981f71 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -152,8 +152,12 @@ @click="handleIconClick"> @@ -187,6 +191,7 @@ exportPrepayment, getPrepayment, listPrepayment, + listNoPrepayment, updatePrepayment } from "@/api/fantang/prepayment"; @@ -195,7 +200,8 @@ components: {}, data() { return { - restaurants: [], + suggestionList:[], + NoPrepayments: [], state: '', // 遮罩层 loading: true, @@ -245,13 +251,16 @@ this.getList(); }, mounted() { - this.restaurants = this.loadAll(); + this.loadAll(); }, methods: { // 响应自动查询回显 querySearch(queryString, cb) { - var restaurants = this.restaurants; + var restaurants = this.suggestionList; + console.log("restaurants-->", restaurants); + console.log("queryString", queryString) + console.log("cb-->", cb) var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants; // 调用 callback 返回建议列表的数据 cb(results); @@ -266,9 +275,18 @@ // 填充所有待缴预付伙食费的病人清单 loadAll() { - return [ - { "value": "南拳妈妈龙虾盖浇饭", "address": "普陀区金沙江路1699号鑫乐惠美食广场A13" } - ]; + listNoPrepayment().then(response => { + this.NoPrepayments = response.rows; + this.suggestionList = this.NoPrepayments.map(item => { + return { + "value": item.hospitalId, + "departName": item.departName, + "name": item.name, + "bedId": item.bedId, + } + }); + return response.rows; + }); }, // 处理自动查询列表选择的事件 @@ -286,7 +304,7 @@ listPrepayment(this.queryParams).then(response => { this.prepaymentList = response.rows; this.total = response.total; - this.loading = false; + this.loadAll(); }); }, // 取消按钮