From 4bec2d207fee70632b2902fd9bbe484c03f35474 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Mon, 4 Jan 2021 15:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E4=BA=BA=E9=85=8D=E9=A4=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtCateringDaoController.java   |  2 ++
 .../fantang/domain/FtFoodDemandDao.java       |  7 +++++
 .../mapper/fantang/FtFoodDemandDaoMapper.xml  | 29 +++++++++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java
index 27263763d..f23046c07 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java
@@ -97,6 +97,7 @@ public class FtCateringDaoController extends BaseController {
                 foodDemandDao.setType(type);
                 foodDemandDao.setNutritionFoodId(ftCateringDao.getNumber());
                 foodDemandDao.setCreateAt(new Date());
+                foodDemandDao.setNutritionFoodFlag(0);
                 iFtFoodDemandDaoService.save(foodDemandDao);
             } else {
                 QueryWrapper<FtFoodDemandDao> wrapper = new QueryWrapper<>();
@@ -105,6 +106,7 @@ public class FtCateringDaoController extends BaseController {
                 FtFoodDemandDao foodDemandDao = iFtFoodDemandDaoService.getOne(wrapper);
                 foodDemandDao.setNutritionFoodId(ftCateringDao.getNumber());
                 foodDemandDao.setUpdateAt(new Date());
+                foodDemandDao.setNutritionFoodFlag(0);
                 iFtFoodDemandDaoService.updateById(foodDemandDao);
             }
         }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
index abcc64f46..832f53cd8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -125,4 +126,10 @@ public class FtFoodDemandDao extends BasePatient implements Serializable {
      * 营养餐标志
      **/
     private Integer nutritionFoodFlag;
+
+    /**
+     * 营养餐名
+     */
+    @TableField(exist = false)
+    private String nutritionFood;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
index a4ce26d09..36ff94da4 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
@@ -25,18 +25,37 @@
     </resultMap>
 
     <select id="listNewFormatter" 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
+        SELECT
+        a.*,
+        b.`name`,
+        b.bed_id,
+        c.depart_name,
+        b.hospital_id,
+        d.`name` AS nutrition_food
+        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
+        LEFT JOIN ft_nutrition_food d ON d.id = a.nutrition_food_id
+        WHERE
+        b.off_flag = 0
         <if test="name != null and name !=''">and b.name = #{name}</if>
         <if test="bedId != null">and b.bed_id = #{bedId}</if>
         <if test="departId != null">and b.depart_id = #{departId}</if>
         <if test="hospitalId != null">and b.hospital_id = #{hospitalId}</if>
         <if test="flag != null">and a.flag = #{flag}</if>
+        ORDER BY
+        patient_id ASC,
+        type ASC
     </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 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