Эх сурвалжийг харах

1.控制台大订单统计bug调整

wuhp 1 жил өмнө
parent
commit
99ecf3138d

+ 4 - 5
src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -200,12 +200,11 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
             String bigOrderNumber = bigOrderNo.getOrderNumber();
             BigDecimal smallBigDecimal = new BigDecimal(smallorderNumber);
             BigDecimal bigBigDecimal = new BigDecimal(bigOrderNumber);
-            BigDecimal result = smallBigDecimal.divide(bigBigDecimal, 2, RoundingMode.HALF_UP);
-            bigOrderNo.setCloseRate(result.toString());
+            if(smallBigDecimal.compareTo(BigDecimal.ZERO)>0){
+                BigDecimal result = smallBigDecimal.divide(bigBigDecimal, 2, RoundingMode.HALF_UP);
+                bigOrderNo.setCloseRate(result.toString());
+            }
         }
-
-
-
         return bigOrderNo;
     }
     private BigDecimal calculateTotal(BigDecimal value1, BigDecimal value2, BigDecimal value3) {

+ 2 - 1
src/main/resources/mapper/modules/admin/CompanyDataReport.xml

@@ -54,7 +54,8 @@
     </select>
 
     <select id="querOrdersTotal" resultType="com.ydtech.modules.admin.model.report.company.OrdersDataDto">
-        select sum(a.orderNumber) as "orderNumber",
+        select
+           ifnull(sum(a.orderNumber),0) as "orderNumber",
         count(a.frameno) as "frameno"
         from (
         SELECT