From 42d10696c3ee09ff06535ad80dfe399ad7c28664 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Mon, 7 Dec 2020 23:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E7=97=85?=
 =?UTF-8?q?=E4=BA=BA=E9=85=8D=E9=A4=90=E4=B8=8D=E8=83=BD=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E7=97=85=E4=BA=BA=E4=BF=A1=E6=81=AF=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/FtFoodDemandDaoController.java       | 3 ++-
 .../ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java  | 2 ++
 .../system/fantang/service/IFtFoodDemandDaoService.java     | 2 ++
 .../fantang/service/impl/FtFoodDemandDaoServiceImpl.java    | 6 +++++-
 .../main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml | 6 ++++++
 ruoyi-ui/src/views/fantang/foodDemand/index.vue             | 1 -
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
index ab1f173c7..66219a906 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
@@ -64,7 +64,8 @@ public class FtFoodDemandDaoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fantang:foodDemand:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(iFtFoodDemandDaoService.getById(id));
+        FtFoodDemandDao ftFoodDemandDao =  iFtFoodDemandDaoService.getByIdNewFormatter(id);
+        return AjaxResult.success(ftFoodDemandDao);
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java
index dd9d52631..b6dd8f646 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java
@@ -23,4 +23,6 @@ public interface FtFoodDemandDaoMapper extends BaseMapper<FtFoodDemandDao> {
     public List<Long> getNewPatientNotDemand();
 
     List<FtFoodDemandDao> listNewFormatter(FtFoodDemandDao ftFoodDemandDao);
+
+    FtFoodDemandDao getByIdNewFormatter(Long id);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java
index 0ceec0a8c..7f32a640e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java
@@ -18,4 +18,6 @@ public interface IFtFoodDemandDaoService extends IService<FtFoodDemandDao> {
     public Integer GenerateOrderForNewPatient() ;
 
     List<FtFoodDemandDao> listNewFormatter(FtFoodDemandDao ftFoodDemandDao);
+
+    FtFoodDemandDao getByIdNewFormatter(Long id);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java
index 93630c556..db318bcfd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.ruoyi.system.fantang.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.fantang.domain.FtFoodDemandDao;
 import com.ruoyi.system.fantang.mapper.FtFoodDemandDaoMapper;
@@ -38,4 +37,9 @@ public class FtFoodDemandDaoServiceImpl extends ServiceImpl<FtFoodDemandDaoMappe
     public List<FtFoodDemandDao> listNewFormatter(FtFoodDemandDao ftFoodDemandDao) {
         return this.baseMapper.listNewFormatter(ftFoodDemandDao);
     }
+
+    @Override
+    public FtFoodDemandDao getByIdNewFormatter(Long id) {
+        return this.baseMapper.getByIdNewFormatter(id);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
index 04df73907..da3767b6b 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
@@ -31,4 +31,10 @@
         <if test="hospitalId != null">and b.hospital_id = #{hospitalId}</if>
         <if test="flag != null">and a.flag = #{flag}</if>
     </select>
+
+    <select id="getByIdNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtFoodDemandDao">
+        select a.*, b.name, b.bed_id, c.depart_name, b.hospital_id from ft_food_demand a LEFT JOIN ft_patient b LEFT
+        JOIN ft_depart c on b.depart_id = c.depart_id on a.patient_id = b.patient_id where b.off_flag = 0 and a.id =
+        #{id}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
index 89becf4fa..a69ab4a46 100644
--- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
@@ -260,7 +260,6 @@ export default {
       this.updateFromOptions = response.data;
     });
     listDepart().then(response => {
-      console.log(response);
       this.departOptions = response.rows;
     })
   },