From 8a349a3b57c8884b62da6f203b15a7069319c602 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 15 Dec 2022 09:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenPyHistoryScoreServiceImpl.java      |  2 +-
 .../indexcoll/ScreenPyHistoryScoreDetailDao.xml    | 14 +++++++-------
 .../indexcoll/ScreenPyWeightConfigurationDao.xml   | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java
index 2280b513cf..cb41b6905b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java
@@ -151,7 +151,7 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ
         //2.字表数据
         LambdaQueryWrapper<ScreenPyHistoryScoreDetailEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ScreenPyHistoryScoreDetailEntity::getHistoryScoreId, formDTO.getId());
-        wrapper.eq(ScreenPyHistoryScoreDetailEntity::getDelFlag, "1");
+        wrapper.eq(ScreenPyHistoryScoreDetailEntity::getDelFlag, "0");
         wrapper.orderByDesc(ScreenPyHistoryScoreDetailEntity::getNldf);
         List<ScreenPyHistoryScoreDetailEntity> list = screenPyHistoryScoreDetailDao.selectList(wrapper);
         List<HistoryScoreDetailResultDTO.Detail> detailList = ConvertUtils.sourceToTarget(list, HistoryScoreDetailResultDTO.Detail.class);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailDao.xml
index bd238aabfe..df3891e1b8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailDao.xml
@@ -47,13 +47,13 @@
             history_score_id,
             agency_id,
             agency_name,
-            wghyd,
-            sjff,
-            xlgc,
-            rhzt,
-            ldgz,
-            qtgz,
-            nldf
+            FORMAT(wghyd, 2)wghyd,
+            FORMAT(sjff, 2)sjff,
+            FORMAT(xlgc, 2)xlgc,
+            FORMAT(rhzt, 2)rhzt,
+            FORMAT(ldgz, 2)ldgz,
+            FORMAT(qtgz, 2)qtgz,
+            FORMAT(nldf, 2)nldf
         FROM
             screen_py_history_score_detail
         WHERE
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyWeightConfigurationDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyWeightConfigurationDao.xml
index 747639f09a..4a29b5dc19 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyWeightConfigurationDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyWeightConfigurationDao.xml
@@ -7,12 +7,12 @@
         SELECT
             id,
             customer_id,
-            wghyd,
-            sjff,
-            xlgc,
-            rhzt,
-            ldgz,
-            qtgz
+            FORMAT(wghyd, 2)wghyd,
+            FORMAT(sjff, 2)sjff,
+            FORMAT(xlgc, 2)xlgc,
+            FORMAT(rhzt, 2)rhzt,
+            FORMAT(ldgz, 2)ldgz,
+            FORMAT(qtgz, 2)qtgz
         FROM
             screen_py_weight_configuration
         WHERE