增加查询结算记录（未完）

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<FtReportMealVo> list = iFtReportMealsDaoService.listAll();
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询所有未付费报餐列表
+     */
+    @PreAuthorize("@ss.hasPermi('fantang:meals:list')")
+    @GetMapping("/listNoPay")
+    public TableDataInfo listNoPay(FtReportMealVo ftReportMealsDao) {
+        startPage();
+        List<FtReportMealVo> list = iFtReportMealsDaoService.listNoPay();
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询所有已付费报餐列表
+     */
+    @PreAuthorize("@ss.hasPermi('fantang:meals:list')")
+    @GetMapping("/listPayoff")
+    public TableDataInfo listPayoff(FtReportMealVo ftReportMealsDao) {
+        startPage();
+        List<FtReportMealVo> list = iFtReportMealsDaoService.listPayoff();
+        return getDataTable(list);
+    }
+
+
+
     /**
      * 查询报餐管理列表
      */

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<FtReportMealVo> {
+    @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<FtReportMealVo> 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<FtReportMealVo> 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<FtReportMealVo> listPayoff();
+}

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<FtReportMealsDao> {
 
+    List<FtReportMealVo> listAll();
+
+    List<FtReportMealVo> listNoPay();
+
+    List<FtReportMealVo> listPayoff();
 }

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<FtReportMealsDaoMapper, FtReportMealsDao> implements IFtReportMealsDaoService {
 
+    @Autowired
+    private FtReportMealVoMapper ftReportMealVoMapper;
+
+    @Override
+    public List<FtReportMealVo> listAll() {
+        return ftReportMealVoMapper.listAll();
+    }
+
+    @Override
+    public List<FtReportMealVo> listNoPay() {
+        return ftReportMealVoMapper.listNoPay();
+    }
+
+    @Override
+    public List<FtReportMealVo> listPayoff() {
+        return ftReportMealVoMapper.listPayoff();
+    }
 }

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;
+//
+
+}

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
   })
-}
+}

ruoyi-ui/src/views/fantang/settle/index.vue

@@ -1,6 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="住院号" prop="hospitalId">
+        <el-input
+          v-model="queryParams.hospitalId"
+          placeholder="请输入住院号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="结算日期" prop="settleAt">
         <el-date-picker clearable size="small" style="width: 200px"
                         v-model="queryParams.settleAt"
@@ -18,38 +36,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="应收" prop="payable">
+      <el-form-item label="结算标志" prop="settlementFlag">
-        <el-input
+        <el-select v-model="queryParams.settlementFlag" @change="selectSettlementFlag" placeholder="请选择">
-          v-model="queryParams.payable"
+          <el-option
-          placeholder="请输入应收"
+            v-for="item in settlementFlagOptions"
-          clearable
+            :key="item.value"
-          size="small"
+            :label="item.label"
-          @keyup.enter.native="handleQuery"
+            :value="item.value">
-        />
+          </el-option>
-      </el-form-item>
-      <el-form-item label="实收" prop="receipts">
-        <el-input
-          v-model="queryParams.receipts"
-          placeholder="请输入实收"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="结算类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择结算类型" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
-      <el-form-item label="退款总额" prop="refund">
-        <el-input
-          v-model="queryParams.refund"
-          placeholder="请输入退款总额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -64,7 +60,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:settle:add']"
-        >新增
+        >伙食费收款
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -75,7 +71,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:settle:edit']"
-        >修改
+        >出院结算
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -105,6 +101,10 @@
     <el-table v-loading="loading" :data="settleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="结算 id" align="center" prop="settleId" v-if="false"/>
+      <el-table-column label="住院号" align="center" prop="hospitalId"/>
+      <el-table-column label="姓名" align="center" prop="name"/>
+      <el-table-column label="科室" align="center" prop="departName"/>
+      <el-table-column label="床号" align="center" prop="bedId"/>
       <el-table-column label="结算日期" align="center" prop="settleAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.settleAt, '{y}-{m}-{d}') }}</span>
@@ -180,12 +180,26 @@
 
 <script>
 import {addSettle, delSettle, exportSettle, getSettle, listSettle, updateSettle} from "@/api/fantang/settle";
+import {listNoPay, listAll, listPayoff} from "../../../api/fantang/meals";
 
 export default {
   name: "Settle",
   components: {},
   data() {
     return {
+
+      // 结算类型字典
+      settlementFlagOptions: [{
+        value: null,
+        label: '全部数据'
+      }, {
+        value: 0,
+        label: '未结算'
+      }, {
+        value: 1,
+        label: '已结算'
+      }, ],
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -213,7 +227,10 @@ export default {
         payable: null,
         receipts: null,
         type: null,
-        refund: null
+        refund: null,
+        hospitalId: null,
+        name: null,
+        settlementFlag: 0,
       },
       // 表单参数
       form: {},
@@ -244,6 +261,31 @@ export default {
     this.getList();
   },
   methods: {
+
+    // 处理筛选结算标志
+    selectSettlementFlag(value) {
+      console.log("value", value)
+      if (value === null) {
+        this.loading = true;
+        listAll(this.queryParams).then(response => {
+          this.settleList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else if (value === 0) {
+        listNoPay(this.queryParams).then(response => {
+          this.settleList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else {
+        listPayoff(this.queryParams).then(response => {
+          this.settleList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
+    },
     /** 查询结算报列表 */
     getList() {
       this.loading = true;