From c56d944ab7bae027b788fb0f3b614ce29adbaec0 Mon Sep 17 00:00:00 2001
From: ICEC <414933307@qq.com>
Date: Tue, 7 Jul 2020 23:02:11 +0800
Subject: [PATCH] no commit message

---
 ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue       | 6 +++++-
 .../java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java    | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue b/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
index e47693d53..05d9e87a9 100644
--- a/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
+++ b/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
@@ -94,7 +94,11 @@
             </el-table-column>
             <el-table-column
               prop="ChangeMould"
-              label="是否换模">
+              label="是否换模中">
+              <template scope="scope">
+                <span v-if="scope.row.ChangeMould" style="color:red">换模中</span>
+                <span v-else style="color: #37B328">否</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="SoCode"
diff --git a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java
index 20481bf8f..b37fc9f3f 100644
--- a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java
+++ b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java
@@ -80,11 +80,7 @@ public class DB_Ajax_DashBoard_48102 {
 			Connection conn = getSQLConnection();
 			String sql = "SELECT\n" +
 					"\t( SELECT MAX ( MouldingDisplayBoardOperation.OperateTime ) FROM MouldingDisplayBoardOperation WHERE MouldingDisplayBoardOperation.DisplayBoardId = V_MouldingDisplayBoard.Id ) AS LastUpdateDate,\n" +
-					"CASE\n" +
-					"\t\t\n" +
-					"\t\tWHEN ChangeMould = 0 THEN\n" +
-					"\t\tN'否' ELSE N'是' \n" +
-					"\tEND AS ChangeMould,\n" +
+					"ChangeMould,\n" +
 					"\tdbo.V_MouldingDisplayBoard.Id,\n" +
 					"\tdbo.V_MouldingDisplayBoard.Line,\n" +
 					"\tdbo.V_MouldingDisplayBoard.CustomerName,\n" +