查询调整

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

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

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