From ff8a4be89b050880eb035a5cbbfaa20c023cabb8 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Mon, 1 Feb 2021 18:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8D=B0=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E8=BD=AC=E6=8D=A2=E4=B8=AD=E6=96=87=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartz/task/FtGenerateOrderTask.java      |  4 +-
 .../fantang/mapper/FtReportMealVoMapper.java  |  6 +--
 .../mapper/fantang/FtReportMealsDaoMapper.xml |  1 +
 ruoyi-ui/src/components/RuoYi/Doc/index.vue   | 42 +++++++++----------
 ruoyi-ui/src/components/RuoYi/Git/index.vue   |  6 +--
 ruoyi-ui/src/layout/components/Navbar.vue     |  6 +--
 .../views/fantang/mealsStatistics/index.vue   | 13 ++++--
 7 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java
index 2a6b61385..ae162fb65 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java
@@ -27,17 +27,19 @@ public class FtGenerateOrderTask {
 
     public void GenerateOrderTask() {
         System.out.println("执行生成一条病患默认订餐配置记录");
+        log.info("执行生成一条病患默认订餐配置记录");
         foodDemandDaoService.GenerateOrderForNewPatient();
     }
 
     public void GeneratePatientTomorrowReportMeal() {
         System.out.println("生成次日病患报餐记录");
+        log.info("生成次日病患报餐记录");
         reportMealVoMapper.insertTomorrowReportMeal();
     }
 
     // 生成次日员工订餐记录
     public void GenerateStaffTomorrowOrder() {
-        System.out.println("生成次日员工订餐记录");
+        log.info("生成次日员工订餐记录");
         orderDaoService.GenerateStaffTomorrowOrder();
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java
index 42daa0624..baff63701 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java
@@ -33,9 +33,9 @@ public interface FtReportMealVoMapper extends BaseMapper<FtReportMealVo> {
     @Insert("INSERT INTO ft_report_meals (create_at,type,patient_id,foods,settlement_flag,price,open_flag,nutrition_food_flag,nutrition_food_id,nutrition_food_price) " +
             "SELECT date_add(now(), INTERVAL 1 DAY), d.type, d.patient_id, d.foods,0," +
             "(SELECT sum(price) FROM ft_food f WHERE FIND_IN_SET(f.food_id, d.foods)) AS price," +
-            "d.open_flag,0,d.nutrition_food_id, e.price as nutrition_food_price" +
-            "FROM ft_food_demand d" +
-            "LEFT JOIN ft_patient p ON p.patient_id = d.patient_id AND p.off_flag = 0" +
+            "d.open_flag,0,d.nutrition_food_id, e.price as nutrition_food_price " +
+            "FROM ft_food_demand d " +
+            "LEFT JOIN ft_patient p ON p.patient_id = d.patient_id AND p.off_flag = 0 " +
             "LEFT JOIN ft_nutrition_food e ON e.id = d.nutrition_food_id")
     public void insertTomorrowReportMeal();
 
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
index 84eacc8e8..0c22bd301 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
@@ -134,6 +134,7 @@
             <if test="beginOfDay != null">AND a.create_at BETWEEN #{beginOfDay}</if>
             <if test="endOfDay != null">AND #{endOfDay}</if>
         </where>
+        order by b.`name`
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/RuoYi/Doc/index.vue b/ruoyi-ui/src/components/RuoYi/Doc/index.vue
index 3915c2965..70ae33c5c 100644
--- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue
+++ b/ruoyi-ui/src/components/RuoYi/Doc/index.vue
@@ -1,21 +1,21 @@
-<template>
-  <div>
-    <svg-icon icon-class="question" @click="goto"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'RuoYiDoc',
-  data() {
-    return {
-      url: 'http://doc.ruoyi.vip/ruoyi-vue'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
\ No newline at end of file
+<template>
+  <div>
+    <svg-icon icon-class="question" @click="goto"/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RuoYiDoc',
+  data() {
+    return {
+      url: 'https://www.yuque.com/wbyzhg/manual/gniqvo'
+    }
+  },
+  methods: {
+    goto() {
+      window.open(this.url)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/ruoyi-ui/src/components/RuoYi/Git/index.vue
index 1d09a7742..e84bd3c9f 100644
--- a/ruoyi-ui/src/components/RuoYi/Git/index.vue
+++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg-icon icon-class="github" @click="goto"/>
+    <svg-icon icon-class="documentation" @click="goto"/>
   </div>
 </template>
 
@@ -9,7 +9,7 @@ export default {
   name: 'RuoYiGit',
   data() {
     return {
-      url: 'https://gitee.com/y_project/RuoYi-Vue'
+      url: 'https://www.yuque.com/wbyzhg/manual/mgrtz2'
     }
   },
   methods: {
@@ -18,4 +18,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index b11460a37..23ce5f0eb 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,12 +7,12 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+
+        <el-tooltip content="升级信息" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+        <el-tooltip content="产品手册" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
         </el-tooltip>
 
diff --git a/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue b/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue
index 24030ec08..395d20ea1 100644
--- a/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue
+++ b/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue
@@ -295,10 +295,14 @@ export default {
     },
     formatToReplace(row) {
       if (row.openFlag) {
-        if (row.isReplaceFood)
-          return '替';
-        else
-          return '加';
+        if(row.nutritionFoodFlag) {
+          if (row.isReplaceFood)
+            return '替';
+          else
+            return '加';
+        } else
+          return '-'
+
       } else
         return '-';
     },
@@ -306,6 +310,7 @@ export default {
 
     formatToNutritionName(row) {
       if (row.openFlag) {
+
         return row.nutritionName;
       } else
         return '-';