From ff8737de03fdf03f56bb34407eab40bbc982f001 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Tue, 1 Dec 2020 17:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=8E=B7=E5=8F=96=E6=9C=80=E8=BF=91=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=97=B6=E9=97=B4=E4=BB=A5=E5=8F=8A=E8=B7=9D?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E7=9A=84=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FtReportMealsDaoController.java | 20 +++++++-- .../controller/FtSettleDaoController.java | 2 + .../fantang/domain/FtReportMealsDao.java | 5 +++ .../fantang/entity/ReportMealsDayEntity.java | 17 +++++++ .../mapper/fantang/FtReportMealsDaoMapper.xml | 24 +++++----- ruoyi-ui/src/views/fantang/settle/index.vue | 44 +++++++++---------- 6 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/ReportMealsDayEntity.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 c9223188e..bcdc82274 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 @@ -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 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 { } - /** * 查询报餐管理列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java index f43cada63..b2e4872fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java @@ -32,6 +32,8 @@ public class FtSettleDaoController extends BaseController { private final IFtSettleDaoService iFtSettleDaoService; + + /** * 查询结算报列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java index e5131d56d..978148687 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java @@ -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; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/ReportMealsDayEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/ReportMealsDayEntity.java new file mode 100644 index 000000000..d626675d1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/ReportMealsDayEntity.java @@ -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; +} diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml index da35e4b98..c2da2e96c 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml @@ -1,18 +1,20 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - + + + + + + + + + + diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue index 8dc4f430f..f3387fc4b 100644 --- a/ruoyi-ui/src/views/fantang/settle/index.vue +++ b/ruoyi-ui/src/views/fantang/settle/index.vue @@ -53,16 +53,16 @@ - - 伙食费收款 - - + + + + + + + + + + 出院结算 - 修改 - + + + + + + + + - + @@ -196,7 +196,7 @@ - + @@ -232,7 +232,7 @@