From b3eaa5bc5fd895c851832a155ac41f1302af5eb1 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Thu, 28 Mar 2024 11:41:06 +0800
Subject: [PATCH] tj

---
 .../yxt/supervise/gf/biz/orderindex/CountValue.java  | 11 ++++++++++-
 .../gf/biz/orderindex/ShReportXmlctgbService.java    | 12 ++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/CountValue.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/CountValue.java
index 446d0fa..49249c8 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/CountValue.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/CountValue.java
@@ -24,7 +24,16 @@ public class CountValue {
         if (glnum == 0)
             return "";
         // 将glnum除以100000000，转换为更易读的格式
-        double rnum = glnum / 100000000;
+        double rnum = glnum / 1000000;
+        // 使用NumberUtil的decimalFormat方法，格式化rnum为两位小数，并返回结果
+        return NumberUtil.decimalFormat("0.00", rnum);
+    }
+    public String getGlkw() {
+        // 判断glnum是否为0，若为0则直接返回空字符串
+        if (glnum == 0)
+            return "";
+        // 将glnum除以100000000，转换为更易读的格式
+        double rnum = glnum / 1000;
         // 使用NumberUtil的decimalFormat方法，格式化rnum为两位小数，并返回结果
         return NumberUtil.decimalFormat("0.00", rnum);
     }
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShReportXmlctgbService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShReportXmlctgbService.java
index ada87fb..4c987d9 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShReportXmlctgbService.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShReportXmlctgbService.java
@@ -80,25 +80,25 @@ public class ShReportXmlctgbService extends ServiceImpl<ShReportXmlctgbMapper, S
         lj.setHyhj_gl("" + cv.getGl());
         cv = baseMapper.countAyhyBetween(tablename, begin, end);
         lj.setAyhy_hs("" + cv.getHs());
-        lj.setAyhy_gl("" + cv.getGl());
+        lj.setAyhy_gl("" + cv.getGlkw());
         cv = baseMapper.countZhhyBetween(tablename, begin, end);
         lj.setZhhy_hs("" + cv.getHs());
-        lj.setZhhy_gl("" + cv.getGl());
+        lj.setZhhy_gl("" + cv.getGlkw());
         cv = baseMapper.countQbhyBetween(tablename, begin, end);
         lj.setQbhy_hs("" + cv.getHs());
-        lj.setQbhy_gl("" + cv.getGl());
+        lj.setQbhy_gl("" + cv.getGlkw());
         cv = baseMapper.countGsyhjBetween(tablename, begin, end);
         lj.setGsyhj_hs("" + cv.getHs());
         lj.setGsyhj_gl("" + cv.getGl());
         cv = baseMapper.countAygsyBetween(tablename, begin, end);
         lj.setAygsy_hs("" + cv.getHs());
-        lj.setAygsy_gl("" + cv.getGl());
+        lj.setAygsy_gl("" + cv.getGlkw());
         cv = baseMapper.countZhgsyBetween(tablename, begin, end);
         lj.setZhgsy_hs("" + cv.getHs());
-        lj.setZhgsy_gl("" + cv.getGl());
+        lj.setZhgsy_gl("" + cv.getGlkw());
         cv = baseMapper.countQbgsyBetween(tablename, begin, end);
         lj.setQbgsy_hs("" + cv.getHs());
-        lj.setQbgsy_gl("" + cv.getGl());
+        lj.setQbgsy_gl("" + cv.getGlkw());
     }
 
     private ShReportXmlctgb buildLj(String day, String createTime, String tablename, String zbh, String zmc) {