Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
czx 2020-12-01 17:42:02 +08:00
commit a5107c5a44
6 changed files with 76 additions and 36 deletions

View File

@ -1,6 +1,7 @@
package com.ruoyi.system.fantang.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@ -9,6 +10,7 @@ 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.FtReportMealsDao;
import com.ruoyi.system.fantang.entity.ReportMealsDayEntity;
import com.ruoyi.system.fantang.service.IFtReportMealsDaoService;
import com.ruoyi.system.fantang.vo.FtReportMealVo;
import lombok.RequiredArgsConstructor;
@ -17,6 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
@ -36,8 +39,20 @@ public class FtReportMealsDaoController extends BaseController {
* 查询指定用户上一次结算的日期并通过这个日期计算未结算的天数
*/
@GetMapping("/getLastSettlementDate/{patientId}")
public TableDataInfo getLastSettlementDate(@PathVariable("patiendId") Long patiendId) {
return null;
public AjaxResult getLastSettlementDate(@PathVariable("patiendId") Long patiendId) {
QueryWrapper<FtReportMealsDao> wrapper = new QueryWrapper<>();
wrapper.eq("patient_id", patiendId);
wrapper.orderByDesc("settlement_at");
wrapper.last("limit 1");
FtReportMealsDao ftReportMealsDao = iFtReportMealsDaoService.getOne(wrapper);
Date settlementAt = ftReportMealsDao.getSettlementAt();
int days = (int) (new Date().getTime() - settlementAt.getTime()) / (1000 * 3600 * 24);
ReportMealsDayEntity reportMealsDayEntity = new ReportMealsDayEntity();
reportMealsDayEntity.setCreateAt(settlementAt);
reportMealsDayEntity.setDays(days);
return AjaxResult.success(reportMealsDayEntity);
}
@ -76,7 +91,6 @@ public class FtReportMealsDaoController extends BaseController {
}
/**
* 查询报餐管理列表
*/

View File

@ -32,6 +32,8 @@ public class FtSettleDaoController extends BaseController {
private final IFtSettleDaoService iFtSettleDaoService;
/**
* 查询结算报列表
*/

View File

@ -77,4 +77,9 @@ public class FtReportMealsDao implements Serializable {
* 结算标志
*/
private Long settlementFlag;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date settlementAt;
private String settlementBy;
}

View File

@ -0,0 +1,17 @@
package com.ruoyi.system.fantang.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ReportMealsDayEntity {
private Date createAt;
private int days;
}

View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.fantang.mapper.FtReportMealsDaoMapper">
<resultMap type="FtReportMealsDao" id="FtReportMealsDaoResult">
<result property="id" column="id" />
<result property="createAt" column="create_at" />
<result property="type" column="type" />
<result property="patientId" column="patient_id" />
<result property="createBy" column="create_by" />
<result property="foods" column="foods" />
<result property="price" column="price" />
<result property="settlementFlag" column="settlement_flag" />
<result property="id" column="id"/>
<result property="createAt" column="create_at"/>
<result property="type" column="type"/>
<result property="patientId" column="patient_id"/>
<result property="createBy" column="create_by"/>
<result property="foods" column="foods"/>
<result property="price" column="price"/>
<result property="settlementFlag" column="settlement_flag"/>
<result property="settlementAt" column="settlement_at"/>
<result property="settlementBy" column="settlement_by"/>
</resultMap>

View File

@ -53,16 +53,16 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['fantang:settle:add']"
>伙食费收款
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['fantang:settle:add']"-->
<!-- >伙食费收款-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@ -131,14 +131,14 @@
v-hasPermi="['fantang:settle:AddLeaveSettlement']"
>出院结算
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['fantang:settle:edit']"
>修改
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['fantang:settle:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<el-button
size="mini"
type="text"
@ -159,7 +159,7 @@
@pagination="getList"
/>
<!-- 日常收费弹出层对话框-->
<!-- 日常收费弹出层对话框-->
<el-dialog title="伙食费结算窗口" :visible.sync="flagAddNewSettlementOpen" width="600px" append-to-body>
<el-form ref="form" :model="formAddNewSettlement" :rules="rules" label-width="160px">
<el-form-item label="住院号" prop="hospitalId">
@ -196,7 +196,7 @@
</div>
</el-dialog>
<!-- 出院结算弹出层对话框-->
<!-- 出院结算弹出层对话框-->
<!-- 添加或修改结算报对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -232,7 +232,7 @@
<script>
import {addSettle, delSettle, exportSettle, getSettle, listSettle, updateSettle} from "@/api/fantang/settle";
import {listNoPay, listAll, listPayoff} from "../../../api/fantang/meals";
import {listAll, listNoPay, listPayoff} from "@/api/fantang/meals";
export default {
name: "Settle",
@ -273,7 +273,7 @@ export default {
}, {
value: 1,
label: '已结算'
}, ],
},],
//
loading: true,