abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
czx 2021-02-01 18:11:00 +08:00
parent 8e5f19069d
commit ff8a4be89b
7 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java
View File

@ -27,17 +27,19 @@ public class FtGenerateOrderTask {
public void GenerateOrderTask() { public void GenerateOrderTask() {
System.out.println("执行生成一条病患默认订餐配置记录"); System.out.println("执行生成一条病患默认订餐配置记录");
log.info("执行生成一条病患默认订餐配置记录");
foodDemandDaoService.GenerateOrderForNewPatient(); foodDemandDaoService.GenerateOrderForNewPatient();
} }
public void GeneratePatientTomorrowReportMeal() { public void GeneratePatientTomorrowReportMeal() {
System.out.println("生成次日病患报餐记录"); System.out.println("生成次日病患报餐记录");
log.info("生成次日病患报餐记录");
reportMealVoMapper.insertTomorrowReportMeal(); reportMealVoMapper.insertTomorrowReportMeal();
} }
// 生成次日员工订餐记录 // 生成次日员工订餐记录
public void GenerateStaffTomorrowOrder() { public void GenerateStaffTomorrowOrder() {
System.out.println("生成次日员工订餐记录"); log.info("生成次日员工订餐记录");
orderDaoService.GenerateStaffTomorrowOrder(); orderDaoService.GenerateStaffTomorrowOrder();
} }

1
ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
View File

@ -134,6 +134,7 @@
<if test="beginOfDay != null">AND a.create_at BETWEEN #{beginOfDay}</if> <if test="beginOfDay != null">AND a.create_at BETWEEN #{beginOfDay}</if>
<if test="endOfDay != null">AND #{endOfDay}</if> <if test="endOfDay != null">AND #{endOfDay}</if>
</where> </where>
order by b.`name`
</select> </select>
</mapper> </mapper>

2
ruoyi-ui/src/components/RuoYi/Doc/index.vue
View File

@ -9,7 +9,7 @@ export default {
name: 'RuoYiDoc', name: 'RuoYiDoc',
data() { data() {
return { return {
url: 'http://doc.ruoyi.vip/ruoyi-vue' url: 'https://www.yuque.com/wbyzhg/manual/gniqvo'
} }
}, },
methods: { methods: {

4
ruoyi-ui/src/components/RuoYi/Git/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<svg-icon icon-class="github" @click="goto"/> <svg-icon icon-class="documentation" @click="goto"/>
</div> </div>
</template> </template>
@ -9,7 +9,7 @@ export default {
name: 'RuoYiGit', name: 'RuoYiGit',
data() { data() {
return { return {
url: 'https://gitee.com/y_project/RuoYi-Vue' url: 'https://www.yuque.com/wbyzhg/manual/mgrtz2'
} }
}, },
methods: { methods: {

4
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -8,11 +8,11 @@
<template v-if="device!=='mobile'"> <template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" /> <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" /> <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip> </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" /> <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>

5
ruoyi-ui/src/views/fantang/mealsStatistics/index.vue
View File

@ -295,10 +295,14 @@ export default {
}, },
formatToReplace(row) { formatToReplace(row) {
if (row.openFlag) { if (row.openFlag) {
if(row.nutritionFoodFlag) {
if (row.isReplaceFood) if (row.isReplaceFood)
return '替'; return '替';
else else
return '加'; return '加';
} else
return '-'
} else } else
return '-'; return '-';
}, },
@ -306,6 +310,7 @@ export default {
formatToNutritionName(row) { formatToNutritionName(row) {
if (row.openFlag) { if (row.openFlag) {
return row.nutritionName; return row.nutritionName;
} else } else
return '-'; return '-';