优化打印数值转换中文数字

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();
     }
 

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();
 

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>

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>
+<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>

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>
+</script>

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>
 

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 '-';