From d708c734df16a841184ec610319385092230733e Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Mon, 30 Nov 2020 18:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E8=AE=B0=E5=BD=95=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FtReportMealsDaoController.java | 36 ++++++ .../fantang/mapper/FtReportMealVoMapper.java | 27 +++++ .../service/IFtReportMealsDaoService.java | 8 ++ .../impl/FtReportMealsDaoServiceImpl.java | 22 ++++ .../system/fantang/vo/FtReportMealVo.java | 63 ++++++++++ ruoyi-ui/src/api/fantang/meals.js | 29 ++++- ruoyi-ui/src/views/fantang/settle/index.vue | 108 ++++++++++++------ 7 files changed, 259 insertions(+), 34 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java index a6611bdf7..06356abb6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java @@ -10,6 +10,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtReportMealsDao; import com.ruoyi.system.fantang.service.IFtReportMealsDaoService; +import com.ruoyi.system.fantang.vo.FtReportMealVo; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,6 +32,41 @@ public class FtReportMealsDaoController extends BaseController { private final IFtReportMealsDaoService iFtReportMealsDaoService; + /** + * 查询所有报餐列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:meals:list')") + @GetMapping("/listAll") + public TableDataInfo listAll(FtReportMealVo ftReportMealsDao) { + startPage(); + List list = iFtReportMealsDaoService.listAll(); + return getDataTable(list); + } + + /** + * 查询所有未付费报餐列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:meals:list')") + @GetMapping("/listNoPay") + public TableDataInfo listNoPay(FtReportMealVo ftReportMealsDao) { + startPage(); + List list = iFtReportMealsDaoService.listNoPay(); + return getDataTable(list); + } + + /** + * 查询所有已付费报餐列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:meals:list')") + @GetMapping("/listPayoff") + public TableDataInfo listPayoff(FtReportMealVo ftReportMealsDao) { + startPage(); + List list = iFtReportMealsDaoService.listPayoff(); + return getDataTable(list); + } + + + /** * 查询报餐管理列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java new file mode 100644 index 000000000..310cabf7e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.system.fantang.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.fantang.domain.FtReportMealsDao; +import com.ruoyi.system.fantang.vo.FtReportMealVo; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 报餐管理Mapper接口 + * + * @author ft + * @date 2020-11-19 + */ +@Repository +public interface FtReportMealVoMapper extends BaseMapper { + @Select("select a.*, b.hospital_id, b.bed_id, b.`name`, c.depart_name, c.depart_code from ft_report_meals 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") + public List listAll(); + + @Select("select a.*, b.hospital_id, b.bed_id, b.`name`, c.depart_name, c.depart_code from ft_report_meals 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") + public List listNoPay(); + + @Select("select a.*, b.hospital_id, b.bed_id, b.`name`, c.depart_name, c.depart_code from ft_report_meals 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") + public List listPayoff(); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java index 98b8963cd..2f3fe8161 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java @@ -2,6 +2,9 @@ package com.ruoyi.system.fantang.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtReportMealsDao; +import com.ruoyi.system.fantang.vo.FtReportMealVo; + +import java.util.List; /** * 报餐管理Service接口 @@ -11,4 +14,9 @@ import com.ruoyi.system.fantang.domain.FtReportMealsDao; */ public interface IFtReportMealsDaoService extends IService { + List listAll(); + + List listNoPay(); + + List listPayoff(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java index 7c9194b02..809586ff9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java @@ -2,10 +2,15 @@ package com.ruoyi.system.fantang.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.fantang.domain.FtReportMealsDao; +import com.ruoyi.system.fantang.mapper.FtReportMealVoMapper; import com.ruoyi.system.fantang.mapper.FtReportMealsDaoMapper; import com.ruoyi.system.fantang.service.IFtReportMealsDaoService; +import com.ruoyi.system.fantang.vo.FtReportMealVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 报餐管理Service业务层处理 * @@ -15,4 +20,21 @@ import org.springframework.stereotype.Service; @Service public class FtReportMealsDaoServiceImpl extends ServiceImpl implements IFtReportMealsDaoService { + @Autowired + private FtReportMealVoMapper ftReportMealVoMapper; + + @Override + public List listAll() { + return ftReportMealVoMapper.listAll(); + } + + @Override + public List listNoPay() { + return ftReportMealVoMapper.listNoPay(); + } + + @Override + public List listPayoff() { + return ftReportMealVoMapper.listPayoff(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java new file mode 100644 index 000000000..bae11ef90 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java @@ -0,0 +1,63 @@ +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 com.ruoyi.system.fantang.domain.FtReportMealsDao; +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) +public class FtReportMealVo extends FtReportMealsDao { + +// private static final long serialVersionUID = 1L; + + /** + * select a.*, b.hospital_id, b.bed_id, b.`name`, c.depart_name + * from ft_report_meals 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 + */ + private String name; + + private String bedId; + + private String departName; + + private String hospitalId; + + private String departCode; + +// private Date createAt; +// +// private Integer type; +// +// private Long patientId; +// +// private String createBy; +// +// private String foods; +// +// private float price; +// +// private Integer settlementFlag; +// + +} diff --git a/ruoyi-ui/src/api/fantang/meals.js b/ruoyi-ui/src/api/fantang/meals.js index c30be269d..2ab301c70 100644 --- a/ruoyi-ui/src/api/fantang/meals.js +++ b/ruoyi-ui/src/api/fantang/meals.js @@ -1,5 +1,32 @@ import request from '@/utils/request' +// 查询所有报餐管理列表 +export function listAll(query) { + return request({ + url: '/fantang/meals/listAll', + method: 'get', + params: query + }) +} +// 查询未结算报餐记录 +export function listNoPay(query) { + return request({ + url: '/fantang/meals/listNoPay', + method: 'get', + params: query + }) +} + +// 查询已结算报餐记录 +export function listPayoff(query) { + return request({ + url: '/fantang/meals/listPayoff', + method: 'get', + params: query + }) +} + + // 查询报餐管理列表 export function listMeals(query) { return request({ @@ -50,4 +77,4 @@ export function exportMeals(query) { method: 'get', params: query }) -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue index 31f7d3a07..f4faec07e 100644 --- a/ruoyi-ui/src/views/fantang/settle/index.vue +++ b/ruoyi-ui/src/views/fantang/settle/index.vue @@ -1,6 +1,24 @@