zhuyiyi 2 өдөр өмнө
parent
commit
592e78a26f

+ 2 - 1
SiteCore/Handler/sync.orderReport.cs

@@ -1193,6 +1193,7 @@ namespace SiteCore.Handler
             {
                 try
                 {
+                    dr["name"] = dr["name"];
                     Dictionary<String, object> map3 = map1[dr["did"]];
                     Dictionary<String, object> map4 = mapweek[dr["did"]];
                     Dictionary<String, object> map5 = mapDay[dr["did"]];
@@ -1238,7 +1239,7 @@ namespace SiteCore.Handler
                     dr["onAvgRate"] = map5["AvgRate"];
                     dr["waitSum"] = map3["waitSum"];
                     dr["designTime"] = map3["designTime"];
-                    dr["onFinalizationRateSum"] = Math.Round(Convert.ToDouble(dr["FinalizationRate"]) / Convert.ToDouble(dr["AllOrder"]) * 100, 2);
+                    dr["onFinalizationRateSum"] = Convert.ToDouble(dr["AllOrder"]) == 0 ? 0 : Math.Round(Convert.ToDouble(dr["FinalizationRate"]) / Convert.ToDouble(dr["AllOrder"]) * 100, 2);
                     sumRefund += Convert.ToDouble(dr["refund"]);
                     sumPlyAmount += Convert.ToDouble(dr["sumPlyAmount"]);
                     sumDesignPayment += Convert.ToDouble(dr["designPayment"]);

+ 1 - 1
Web/ECharts/DesignMulitRate.aspx

@@ -226,7 +226,7 @@
             <div property="columns">
                 <div field="OrgName" width="60" align="center" headeralign="center">团队</div>
                 <div field="name" width="60" align="center" headeralign="center">设计师</div>
-                <div field="sumNum" datatype="int" width="60" align="center" headeralign="center">总数量</div>
+                <div field="AllOrder" datatype="int" width="60" align="center" headeralign="center">总数量</div>
                 <div field="onFinalizationRateSum" datatype="string" width="60" align="center" headeralign="center">定稿率</div>
                 <div field="refund" datatype="string" width="60" align="center" headeralign="center">退款数量</div>
                 <div field="designTime" datatype="string" width="60" align="center" headeralign="center">上传文件</div>