优化

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -132,7 +132,7 @@
     </select>
 
     <select id="selectReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
-        select ifnull(sum(dr.saleOfStockRatio), 0)            as saleOfStockRatio,
+        select ifnull(sum(SUBSTRING_INDEX(dr.saleOfStockRatio, ':', 1)/SUBSTRING_INDEX(dr.saleOfStockRatio, ':', -1)), 0)            as saleOfStockRatio,
                ifnull(sum(dr.stock_total), 0)                 as stock_total,
                ifnull(sum(dr.stock_unreserve), 0)             as stock_unreserve,
                ifnull(sum(dr.stock_reserve), 0)               as stock_reserve,
@@ -198,7 +198,7 @@
 
     <select id="pageList1" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
         select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
-               sum(saleOfStockRatio)               as saleOfStockRatio,
+               sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1)/SUBSTRING_INDEX(saleOfStockRatio, ':', -1))               as saleOfStockRatio,
                sum(stock_subtotal)                 as stock_subtotal,
                sum(pcOrder_subtotal)               as pcOrder_subtotal,
                sum(saleOrder_subtotal_day)         as saleOrder_subtotal_day,
@@ -217,7 +217,7 @@
 
     <select id="getReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.ReportVo">
         select DATE_FORMAT(createTime, '%Y-%m-%d')         as date,
-               ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
+               ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1)/SUBSTRING_INDEX(saleOfStockRatio, ':', -1)), 0)            as saleOfStockRatio,
                ifnull(sum(stock_total), 0)                 as stock_total,
                ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
                ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
@@ -272,7 +272,7 @@
     </select>
 
     <select id="selectReport2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
-        select ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
+        select ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1)/SUBSTRING_INDEX(saleOfStockRatio, ':', -1)), 0)            as saleOfStockRatio,
                ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
                ifnull(sum(stock_total), 0)                 as stock_total,
                ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
@@ -344,7 +344,7 @@
     </select>
 
     <select id="selectReport3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
-        select ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
+        select ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1)/SUBSTRING_INDEX(saleOfStockRatio, ':', -1)), 0)            as saleOfStockRatio,
                ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
                ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
                ifnull(sum(stock_total), 0)                 as stock_total,
@@ -475,7 +475,7 @@
                ifnull(dr.deliver_loan_year, 0)           as deliver_loan_year,
                ifnull(dr.deliver_full_year, 0)           as deliver_full_year,
                ifnull(dr.deliver_subtotal_year, 0)       as deliver_subtotal_year-->
-        ifnull(sum(dr.saleOfStockRatio), 0)            as saleOfStockRatio,
+        ifnull(sum(SUBSTRING_INDEX(dr.saleOfStockRatio, ':', 1)/SUBSTRING_INDEX(dr.saleOfStockRatio, ':', -1)), 0)            as saleOfStockRatio,
         ifnull(sum(dr.stock_total), 0)                 as stock_total,
         ifnull(sum(dr.stock_unreserve), 0)             as stock_unreserve,
         ifnull(sum(dr.stock_reserve), 0)               as stock_reserve,

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -1095,10 +1095,15 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         List<String> row3 = dailyReportVoList.stream().map(v -> v.getEmissionStandardValue()).collect(Collectors.toList());
         dailyReportAppVo.setRow3(row3);
         //存销比
-        List<String> row4 = dailyReportVoList.stream().map(v -> v.getSaleOfStockRatio()).collect(Collectors.toList());
+        List<String> row4 = dailyReportVoList.stream().map(v ->
+                v.getSaleOfStockRatio().contains(".") ?dicimalToFraction(Double.valueOf(v.getSaleOfStockRatio())):(v.getSaleOfStockRatio()+":1")
+        ).collect(Collectors.toList());
         //合计
-        BigDecimal row4All = row4.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-        row4.add(row4All.toString());
+        BigDecimal row4All = dailyReportVoList.stream().map(v ->
+                v.getSaleOfStockRatio()
+        ).collect(Collectors.toList()).stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        String row4alll = row4All.toString().contains(".")?dicimalToFraction(Double.valueOf(row4All.toString())):(row4All.toString()+":1");
+        row4.add(row4alll);
         dailyReportAppVo.setRow4(row4);
         //库存总计
         List<String> row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList());
@@ -1515,4 +1520,29 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
 
         return qw;
     }
+
+    public String dicimalToFraction(double num) {
+        int count = 0;
+        int base = 10;
+        while (num != Math.floor(num)) {
+            num *= base;
+            count++;
+        }
+
+        base = (int) Math.pow(base, count);
+        int nor = (int) num;
+        int gcd = findGCD(nor, base);
+
+
+        return String.valueOf(nor / gcd) + "/" + String.valueOf(base / gcd);
+    }
+
+    //求最大公约数
+    private int findGCD(int a, int b) {
+        if (a == 0) {
+            return b;
+        }
+        return findGCD(b % a, a);
+    }
+
 }