From fa074e6bfce456256a4f9aa42c89e69a0582f6e7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:05:16 +0800
Subject: [PATCH] 大屏考核分数保留一位数

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java |    2 +-
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml                      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 8fd7965..cca9a63 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -548,7 +548,7 @@
         //濉厖鍚勪釜鍖哄幙鏁版嵁
         for (CheckScore checkScore : dashboard) {
             Map<String, Object> map = new HashMap<>();
-            map.put("score", checkScore.getScore().setScale(2,RoundingMode.HALF_UP));
+            map.put("score", checkScore.getScore().setScale(1,RoundingMode.HALF_UP));
             resultMap.put(checkScore.getDeptName(), map);
         }
         return resultMap;
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 96e1a0f..0cf71b4 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -106,7 +106,7 @@
         left join (
         WITH cte AS (
         SELECT *,row_number() OVER(PARTITION BY serial_number ORDER BY create_time DESC) rn FROM t_work_order
-        WHERE deleted = 0
+        WHERE deleted = 0 and status != 'AUDITING_SUCCESS' and status != 'AUDITING_FAIL'
         ) SELECT * FROM cte WHERE rn=1
         ) w on m.serial_number = w.serial_number and w.deleted = 0
         left join t_yw_unit u on p.unit_id = u.id and u.deleted = 0

--
Gitblit v1.8.0