فهرست منبع

1.资产评估/市场/客户效率值表查询方式调整,导出去掉节点信息

GouGengquan 4 ماه پیش
والد
کامیت
a48f1910ef

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 53 - 69
dao/src/main/resources/mapper/AssetsStatisticalStatementMapper.xml


+ 0 - 2
domain/src/main/java/com/dayou/vo/AssetsEfficiencyDetailVO.java

@@ -116,12 +116,10 @@ public class AssetsEfficiencyDetailVO {
     /**
      * 当前实例节点名称
      */
-    @Excel(name = "当前实例节点名称")
     private String currentNodeName;
 
     /**
      * 当前节点处理人
      */
-    @Excel(name = "当前节点处理人")
     private String handlerName;
 }

+ 7 - 7
service/src/main/java/com/dayou/service/impl/AssetsStatisticalStatementServiceImpl.java

@@ -266,7 +266,7 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
             }
             // 计算环比出单率
-            if (efficiencyVO.getQoQReportVolume() > 0) {
+            if (efficiencyVO.getQoQReportVolume() > 0 && efficiencyVO.getQoQOrderVolume() > 0) {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume())) / (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
@@ -386,13 +386,13 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);
             }
             // 计算同比出单率
-            if (efficiencyVO.getYoYReportVolume() > 0) {
+            if (efficiencyVO.getYoYReportVolume() > 0 && efficiencyVO.getYoYOrderVolume() > 0) {
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getYoYReportVolume() / efficiencyVO.getYoYOrderVolume())) / (efficiencyVO.getYoYReportVolume() / efficiencyVO.getYoYOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
             }
             // 计算环比出单率
-            if (efficiencyVO.getQoQReportVolume() > 0) {
+            if (efficiencyVO.getQoQReportVolume() > 0 && efficiencyVO.getQoQOrderVolume() > 0) {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume())) / (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
@@ -491,7 +491,7 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);
             }
             // 计算同比出单率
-            if (efficiencyVO.getYoYReportVolume() > 0) {
+            if (efficiencyVO.getYoYReportVolume() > 0 && efficiencyVO.getYoYOrderVolume() > 0) {
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getYoYReportVolume() / efficiencyVO.getYoYOrderVolume())) / (efficiencyVO.getYoYReportVolume() / efficiencyVO.getYoYOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
@@ -602,7 +602,7 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
             }
             // 计算环比出单率
-            if (efficiencyVO.getQoQReportVolume() > 0) {
+            if (efficiencyVO.getQoQReportVolume() > 0 && efficiencyVO.getQoQOrderVolume() > 0) {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume())) / (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
@@ -707,13 +707,13 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);
             }
             // 计算同比出单率
-            if (efficiencyVO.getYoYReportVolume() > 0) {
+            if (efficiencyVO.getYoYReportVolume() > 0 && efficiencyVO.getYoYOrderVolume() > 0) {
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getYoYReportVolume() / efficiencyVO.getYoYOrderVolume())) / (efficiencyVO.getYoYReportVolume() / efficiencyVO.getYoYOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setYoYOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
             }
             // 计算环比出单率
-            if (efficiencyVO.getQoQReportVolume() > 0) {
+            if (efficiencyVO.getQoQReportVolume() > 0 && efficiencyVO.getQoQOrderVolume() > 0) {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderHasReportVolume() - (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume())) / (efficiencyVO.getQoQReportVolume() / efficiencyVO.getQoQOrderVolume()) * 100, 2).doubleValue());
             } else {
                 efficiencyVO.setQoQOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());