1.资产认领实收款是更新折扣比例

2.新增资产客户效率值相关接口与导出
3.优化了其他资产统计报表相关接口

biz-base/src/main/java/com/dayou/controller/AssetsStatisticalStatementController.java

@@ -213,4 +213,44 @@ public class AssetsStatisticalStatementController extends BaseController{
         exportPlus(response, "客户经理效率值表", result, AssetsMarketEfficiencyVO.class);
     }
 
+    /**
+     * 资产客户效率值(总)查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    @GetMapping("/customer/total/getEfficiencyVO")
+    public RestResponse<List<AssetsCustomerEfficiencyVO>> getAssetsCustomerTotalEfficiencyVO(AssetsStatisticalSelectDTO dto) {
+        return RestResponse.data(assetsStatisticalStatementService.getAssetsCustomerTotalEfficiencyVO(dto));
+    }
+
+    /**
+     * 资产客户效率值(总)导出
+     * @param dto 查询dto
+     */
+    @GetMapping("/customer/total/getEfficiencyVO/export")
+    public void assetsCustomerTotalEfficiencyVOExport(AssetsStatisticalSelectDTO dto, HttpServletResponse response) throws IOException {
+        List<AssetsCustomerEfficiencyVO> result = assetsStatisticalStatementService.getAssetsCustomerTotalEfficiencyVO(dto);
+        exportPlus(response, "资产客户效率值(总)", result, AssetsCustomerEfficiencyVO.class);
+    }
+
+    /**
+     * 资产客户效率值(客户经理)查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    @GetMapping("/customer/manager/getEfficiencyVO")
+    public RestResponse<List<AssetsCustomerEfficiencyVO>> getAssetsCustomerManagerEfficiencyVO(AssetsStatisticalSelectDTO dto) {
+        return RestResponse.data(assetsStatisticalStatementService.getAssetsCustomerManagerEfficiencyVO(dto));
+    }
+
+    /**
+     * 资产客户效率值(客户经理)导出
+     * @param dto 查询dto
+     */
+    @GetMapping("/customer/manager/getEfficiencyVO/export")
+    public void assetsCustomerManagerEfficiencyVOExport(AssetsStatisticalSelectDTO dto, HttpServletResponse response) throws IOException {
+        List<AssetsCustomerEfficiencyVO> result = assetsStatisticalStatementService.getAssetsCustomerManagerEfficiencyVO(dto);
+        exportPlus(response, "资产客户效率值(客户经理)", result, AssetsCustomerEfficiencyVO.class);
+    }
+
 }

dao/src/main/java/com/dayou/mapper/AssetsStatisticalStatementMapper.java

@@ -110,10 +110,17 @@ public interface AssetsStatisticalStatementMapper {
     List<AssetsMarketEfficiencyVO> getAssetsMarketPerEfficiencyVO(@Param("dto") AssetsStatisticalSelectDTO dto);
 
     /**
-     * 资产客户效率查询
+     * 资产客户效率值(总)查询
      * @param dto 查询dto
      * @return List<AssetsCustomerEfficiencyVO>
      */
-    List<AssetsCustomerEfficiencyVO> getAssetsCustomerEfficiencyVO(@Param("dto") AssetsStatisticalSelectDTO dto);
+    List<AssetsCustomerEfficiencyVO> getAssetsCustomerTotalEfficiencyVO(@Param("dto") AssetsStatisticalSelectDTO dto);
+
+    /**
+     * 资产客户效率值(客户经理)查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    List<AssetsCustomerEfficiencyVO> getAssetsCustomerManagerEfficiencyVO(@Param("dto") AssetsStatisticalSelectDTO dto);
 
 }

dao/src/main/java/com/dayou/mapper/OrderFundMapper.java

@@ -21,4 +21,10 @@ public interface OrderFundMapper extends CustomBaseMapper<OrderFund> {
     void updateRealAmountByOrderId(@Param("orderId") String orderId, @Param("thisTimeAmount") BigDecimal thisTimeAmount);
 
     BigDecimal residueNotAllotAmount(@Param("orderFundId") Long orderFundId);
+
+    /**
+     * 更新折扣比例
+     * @param orderFundId 订单收款信息id
+     */
+    void updateDiscountByOrderIdAfter(@Param("orderFundId") Long orderFundId);
 }

dao/src/main/resources/mapper/OrderFundMapper.xml

@@ -41,4 +41,12 @@
         WHERE `of`.id = #{orderFundId}
           AND `of`.deleted = 0
     </select>
+
+    <!--更新折扣比例-->
+    <update id="updateDiscountByOrderIdAfter">
+        UPDATE order_fund
+        SET discount =  order_fund.real_amount / order_fund.should_amount
+        WHERE id = #{orderFundId}
+    </update>
+
 </mapper>

domain/src/main/java/com/dayou/dto/AssetsStatisticalSelectDTO.java

@@ -14,6 +14,11 @@ public class AssetsStatisticalSelectDTO {
     private Long customerId;
 
     /**
+     * 客户联系人id
+     */
+    private Long clienteleContactId;
+
+    /**
      * 关键字信息
      */
     private String keyWord;

domain/src/main/java/com/dayou/vo/AssetsCustomerEfficiencyVO.java

@@ -8,11 +8,16 @@ import lombok.Data;
 public class AssetsCustomerEfficiencyVO {
 
     /**
-     * 部门id
+     * 客户id
      */
     private Long customerId;
 
     /**
+     * 客户联系人id
+     */
+    private Long clienteleContactId;
+
+    /**
      * 客户名称
      */
     @Excel(name = "客户名称")
@@ -133,18 +138,18 @@ public class AssetsCustomerEfficiencyVO {
      * 实收款总计
      */
     @Excel(name = "实收款总计")
-    private Double allRealAmountSum;
+    private Double totalRealAmountSum;
 
     /**
      * 财务损失(元)
      */
-    @Excel(name = "财务损失(元)")
+//    @Excel(name = "财务损失(元)")
     private Double financialLossSum;
 
     /**
      * 财务损失率(%)
      */
-    @Excel(name = "财务损失率(%)")
+//    @Excel(name = "财务损失率(%)")
     private Double financialLossVolume;
 
     /**

domain/src/main/java/com/dayou/vo/AssetsEvaluateEfficiencyVO.java

@@ -138,6 +138,12 @@ public class AssetsEvaluateEfficiencyVO {
     private Double QoQRealAmountSum;
 
     /**
+     * 实收款总计
+     */
+    @Excel(name = "实收款总计")
+    private Double totalRealAmountSum;
+
+    /**
      * 当期出单率
      */
     @Excel(name = "当期出单率")

domain/src/main/java/com/dayou/vo/AssetsMarketEfficiencyVO.java

@@ -130,6 +130,12 @@ public class AssetsMarketEfficiencyVO {
     private Double QoQRealAmountSum;
 
     /**
+     * 实收款总计
+     */
+    @Excel(name = "实收款总计")
+    private Double totalRealAmountSum;
+
+    /**
      * 当期出单率
      */
     @Excel(name = "当期出单率")

service/src/main/java/com/dayou/service/IAssetsStatisticalStatementService.java

@@ -118,4 +118,18 @@ public interface IAssetsStatisticalStatementService {
      */
     List<AssetsMarketEfficiencyVO> getAssetsMarketPerEfficiencyVO(AssetsStatisticalSelectDTO dto);
 
+    /**
+     * 资产客户效率值查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    List<AssetsCustomerEfficiencyVO> getAssetsCustomerTotalEfficiencyVO(AssetsStatisticalSelectDTO dto);
+
+    /**
+     * 资产客户效率值(客户经理)查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    List<AssetsCustomerEfficiencyVO> getAssetsCustomerManagerEfficiencyVO(AssetsStatisticalSelectDTO dto);
+
 }

service/src/main/java/com/dayou/service/impl/AssetsProductionServiceImpl.java

@@ -407,6 +407,8 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
                 productionFundMapper.updateRealAmount(orderReportDTO.getProductionFundId(), thisTimeAmount);
                 // 更新订单实收款
                 orderFundMapper.updateRealAmount(orderReportDTO.getOrderFundId(), thisTimeAmount);
+                //更新订单折扣比例
+                orderFundMapper.updateDiscountByOrderIdAfter(orderReportDTO.getOrderFundId());
 
                 //插入订单认领记录流水表
                 FinanceClaim financeClaim = new FinanceClaim();

service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -622,6 +622,8 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
                 //更新订单实收款
                 Long orderFundId = orderReportDTO.getOrderFundId();
                 orderFundMapper.updateRealAmount(orderFundId, thisTimeAmount);
+                //更新订单折扣比例
+                orderFundMapper.updateDiscountByOrderIdAfter(orderFundId);
 
                 //插入订单认领流水表
                 FinanceClaim financeClaim = new FinanceClaim();

service/src/main/java/com/dayou/service/impl/AssetsStatisticalStatementServiceImpl.java

@@ -580,6 +580,228 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
     }
 
     /**
+     * 资产客户效率值查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    @Override
+    public List<AssetsCustomerEfficiencyVO> getAssetsCustomerTotalEfficiencyVO(AssetsStatisticalSelectDTO dto) {
+        List<AssetsCustomerEfficiencyVO> efficiencyVOList = assetsStatisticalStatementMapper.getAssetsCustomerTotalEfficiencyVO(dto);
+
+        // 循环计算每个部门的同比、环比
+        for (AssetsCustomerEfficiencyVO efficiencyVO : efficiencyVOList) {
+
+            // 计算当期出单率
+            if (efficiencyVO.getCurrentPeriodReportVolume() > 0) { // 当期出报告书大于0
+                efficiencyVO.setCurrentPeriodOrderHasReportVolume((efficiencyVO.getCurrentPeriodReportVolume().doubleValue() / efficiencyVO.getCurrentPeriodOrderVolume().doubleValue()));
+            } else {
+                efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);
+            }
+            // 计算同比出单率
+            if (efficiencyVO.getYoYReportVolume() > 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) {
+                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());
+            }
+            efficiencyVO.setCurrentPeriodOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
+
+            // 计算当期收费折扣率
+            if (efficiencyVO.getCurrentDiscountVolume() > 0) {
+                efficiencyVO.setCurrentDiscountVolume(efficiencyVO.getCurrentDiscountVolume() / efficiencyVO.getCurrentPeriodOrderVolume());
+            } else {
+                efficiencyVO.setCurrentDiscountVolume(0.0);
+            }
+
+            // 计算同比收费折扣率
+            if (efficiencyVO.getYoYDiscountVolume() > 0) {
+                efficiencyVO.setCurrentDiscountVolume(NumberUtil.round( (efficiencyVO.getCurrentDiscountVolume() - (efficiencyVO.getYoYDiscountVolume() / efficiencyVO.getYoYOrderVolume())) /(efficiencyVO.getYoYDiscountVolume() / efficiencyVO.getYoYOrderVolume()) * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setCurrentDiscountVolume(0.0);
+            }
+
+            // 计算环比收费折扣率
+            if (efficiencyVO.getQoQDiscountVolume() > 0) {
+                efficiencyVO.setCurrentDiscountVolume(NumberUtil.round((efficiencyVO.getCurrentDiscountVolume() - (efficiencyVO.getQoQDiscountVolume() / efficiencyVO.getQoQOrderVolume())) /(efficiencyVO.getQoQDiscountVolume() / efficiencyVO.getQoQOrderVolume()) * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setCurrentDiscountVolume(0.0);
+            }
+            efficiencyVO.setCurrentDiscountVolume(NumberUtil.round(efficiencyVO.getCurrentDiscountVolume() * 100, 2).doubleValue());
+
+            // 同比计算(同比增长率 = (当期数据 - 去年同期数据) / 去年同期数据 * 100%) (保留两位小数)
+            if (efficiencyVO.getYoYOrderVolume() > 0) {
+                efficiencyVO.setYoYOrderVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderVolume() - efficiencyVO.getYoYOrderVolume()) / efficiencyVO.getYoYOrderVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYOrderVolume((double) (efficiencyVO.getCurrentPeriodOrderVolume() * 100));
+            }
+            if (efficiencyVO.getYoYStatementVolume() > 0) {
+                efficiencyVO.setYoYStatementVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodStatementVolume() - efficiencyVO.getYoYStatementVolume()) / efficiencyVO.getYoYStatementVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYStatementVolume((double) (efficiencyVO.getCurrentPeriodStatementVolume() * 100));
+            }
+            if (efficiencyVO.getYoYReportVolume() > 0) {
+                efficiencyVO.setYoYReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodReportVolume() - efficiencyVO.getYoYReportVolume()) / efficiencyVO.getYoYReportVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYReportVolume((double) (efficiencyVO.getCurrentPeriodReportVolume() * 100));
+            }
+            if (efficiencyVO.getYoYShouldAmountSum() > 0) {
+                efficiencyVO.setYoYShouldAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodShouldAmountSum() - efficiencyVO.getYoYShouldAmountSum()) / efficiencyVO.getYoYShouldAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYShouldAmountSum(efficiencyVO.getCurrentPeriodShouldAmountSum() * 100);
+            }
+            if (efficiencyVO.getYoYRealAmountSum() > 0) {
+                efficiencyVO.setYoYRealAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodRealAmountSum() - efficiencyVO.getYoYRealAmountSum()) / efficiencyVO.getYoYRealAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYRealAmountSum(efficiencyVO.getCurrentPeriodRealAmountSum() * 100);
+            }
+
+            // 环比计算(环比增长率 = (当期数据 - 前一期数据) / 前一期数据 * 100%) (保留两位小数)
+            if (efficiencyVO.getQoQOrderVolume() > 0) {
+                efficiencyVO.setQoQOrderVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderVolume() - efficiencyVO.getQoQOrderVolume()) / efficiencyVO.getQoQOrderVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQOrderVolume((double) (efficiencyVO.getCurrentPeriodOrderVolume() * 100));
+            }
+            if (efficiencyVO.getQoQStatementVolume() > 0) {
+                efficiencyVO.setQoQStatementVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodStatementVolume() - efficiencyVO.getQoQStatementVolume()) / efficiencyVO.getQoQStatementVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQStatementVolume((double) (efficiencyVO.getCurrentPeriodStatementVolume() * 100));
+            }
+            if (efficiencyVO.getQoQReportVolume() > 0) {
+                efficiencyVO.setQoQReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodReportVolume() - efficiencyVO.getQoQReportVolume()) / efficiencyVO.getQoQReportVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQReportVolume((double) (efficiencyVO.getCurrentPeriodReportVolume() * 100));
+            }
+            if (efficiencyVO.getQoQShouldAmountSum() > 0) {
+                efficiencyVO.setQoQShouldAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodShouldAmountSum() - efficiencyVO.getQoQShouldAmountSum()) / efficiencyVO.getQoQShouldAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQShouldAmountSum(efficiencyVO.getCurrentPeriodShouldAmountSum() * 100);
+            }
+            if (efficiencyVO.getQoQRealAmountSum() > 0) {
+                efficiencyVO.setQoQRealAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodRealAmountSum() - efficiencyVO.getQoQRealAmountSum()) / efficiencyVO.getQoQRealAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQRealAmountSum(efficiencyVO.getCurrentPeriodRealAmountSum() * 100);
+            }
+        }
+        return efficiencyVOList;
+    }
+
+    /**
+     * 资产客户效率值(客户经理)查询
+     * @param dto 查询dto
+     * @return List<AssetsCustomerEfficiencyVO>
+     */
+    @Override
+    public List<AssetsCustomerEfficiencyVO> getAssetsCustomerManagerEfficiencyVO(AssetsStatisticalSelectDTO dto) {
+        List<AssetsCustomerEfficiencyVO> efficiencyVOList = assetsStatisticalStatementMapper.getAssetsCustomerManagerEfficiencyVO(dto);
+
+        // 循环计算每个部门的同比、环比
+        for (AssetsCustomerEfficiencyVO efficiencyVO : efficiencyVOList) {
+
+            // 计算当期出单率
+            if (efficiencyVO.getCurrentPeriodReportVolume() > 0) { // 当期出报告书大于0
+                efficiencyVO.setCurrentPeriodOrderHasReportVolume((efficiencyVO.getCurrentPeriodReportVolume().doubleValue() / efficiencyVO.getCurrentPeriodOrderVolume().doubleValue()));
+            } else {
+                efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);
+            }
+            // 计算同比出单率
+            if (efficiencyVO.getYoYReportVolume() > 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) {
+                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());
+            }
+            efficiencyVO.setCurrentPeriodOrderHasReportVolume(NumberUtil.round(efficiencyVO.getCurrentPeriodOrderHasReportVolume() * 100, 2).doubleValue());
+
+            // 计算当期收费折扣率
+            if (efficiencyVO.getCurrentDiscountVolume() > 0) {
+                efficiencyVO.setCurrentDiscountVolume(efficiencyVO.getCurrentDiscountVolume() / efficiencyVO.getCurrentPeriodOrderVolume());
+            } else {
+                efficiencyVO.setCurrentDiscountVolume(0.0);
+            }
+
+            // 计算同比收费折扣率
+            if (efficiencyVO.getYoYDiscountVolume() > 0) {
+                efficiencyVO.setCurrentDiscountVolume(NumberUtil.round( (efficiencyVO.getCurrentDiscountVolume() - (efficiencyVO.getYoYDiscountVolume() / efficiencyVO.getYoYOrderVolume())) /(efficiencyVO.getYoYDiscountVolume() / efficiencyVO.getYoYOrderVolume()) * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setCurrentDiscountVolume(0.0);
+            }
+
+            // 计算环比收费折扣率
+            if (efficiencyVO.getQoQDiscountVolume() > 0) {
+                efficiencyVO.setCurrentDiscountVolume(NumberUtil.round((efficiencyVO.getCurrentDiscountVolume() - (efficiencyVO.getQoQDiscountVolume() / efficiencyVO.getQoQOrderVolume())) /(efficiencyVO.getQoQDiscountVolume() / efficiencyVO.getQoQOrderVolume()) * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setCurrentDiscountVolume(0.0);
+            }
+            efficiencyVO.setCurrentDiscountVolume(NumberUtil.round(efficiencyVO.getCurrentDiscountVolume() * 100, 2).doubleValue());
+
+            // 同比计算(同比增长率 = (当期数据 - 去年同期数据) / 去年同期数据 * 100%) (保留两位小数)
+            if (efficiencyVO.getYoYOrderVolume() > 0) {
+                efficiencyVO.setYoYOrderVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderVolume() - efficiencyVO.getYoYOrderVolume()) / efficiencyVO.getYoYOrderVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYOrderVolume((double) (efficiencyVO.getCurrentPeriodOrderVolume() * 100));
+            }
+            if (efficiencyVO.getYoYStatementVolume() > 0) {
+                efficiencyVO.setYoYStatementVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodStatementVolume() - efficiencyVO.getYoYStatementVolume()) / efficiencyVO.getYoYStatementVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYStatementVolume((double) (efficiencyVO.getCurrentPeriodStatementVolume() * 100));
+            }
+            if (efficiencyVO.getYoYReportVolume() > 0) {
+                efficiencyVO.setYoYReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodReportVolume() - efficiencyVO.getYoYReportVolume()) / efficiencyVO.getYoYReportVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYReportVolume((double) (efficiencyVO.getCurrentPeriodReportVolume() * 100));
+            }
+            if (efficiencyVO.getYoYShouldAmountSum() > 0) {
+                efficiencyVO.setYoYShouldAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodShouldAmountSum() - efficiencyVO.getYoYShouldAmountSum()) / efficiencyVO.getYoYShouldAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYShouldAmountSum(efficiencyVO.getCurrentPeriodShouldAmountSum() * 100);
+            }
+            if (efficiencyVO.getYoYRealAmountSum() > 0) {
+                efficiencyVO.setYoYRealAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodRealAmountSum() - efficiencyVO.getYoYRealAmountSum()) / efficiencyVO.getYoYRealAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setYoYRealAmountSum(efficiencyVO.getCurrentPeriodRealAmountSum() * 100);
+            }
+
+            // 环比计算(环比增长率 = (当期数据 - 前一期数据) / 前一期数据 * 100%) (保留两位小数)
+            if (efficiencyVO.getQoQOrderVolume() > 0) {
+                efficiencyVO.setQoQOrderVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodOrderVolume() - efficiencyVO.getQoQOrderVolume()) / efficiencyVO.getQoQOrderVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQOrderVolume((double) (efficiencyVO.getCurrentPeriodOrderVolume() * 100));
+            }
+            if (efficiencyVO.getQoQStatementVolume() > 0) {
+                efficiencyVO.setQoQStatementVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodStatementVolume() - efficiencyVO.getQoQStatementVolume()) / efficiencyVO.getQoQStatementVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQStatementVolume((double) (efficiencyVO.getCurrentPeriodStatementVolume() * 100));
+            }
+            if (efficiencyVO.getQoQReportVolume() > 0) {
+                efficiencyVO.setQoQReportVolume(NumberUtil.round((efficiencyVO.getCurrentPeriodReportVolume() - efficiencyVO.getQoQReportVolume()) / efficiencyVO.getQoQReportVolume() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQReportVolume((double) (efficiencyVO.getCurrentPeriodReportVolume() * 100));
+            }
+            if (efficiencyVO.getQoQShouldAmountSum() > 0) {
+                efficiencyVO.setQoQShouldAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodShouldAmountSum() - efficiencyVO.getQoQShouldAmountSum()) / efficiencyVO.getQoQShouldAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQShouldAmountSum(efficiencyVO.getCurrentPeriodShouldAmountSum() * 100);
+            }
+            if (efficiencyVO.getQoQRealAmountSum() > 0) {
+                efficiencyVO.setQoQRealAmountSum(NumberUtil.round((efficiencyVO.getCurrentPeriodRealAmountSum() - efficiencyVO.getQoQRealAmountSum()) / efficiencyVO.getQoQRealAmountSum() * 100, 2).doubleValue());
+            } else {
+                efficiencyVO.setQoQRealAmountSum(efficiencyVO.getCurrentPeriodRealAmountSum() * 100);
+            }
+        }
+        return efficiencyVOList;
+    }
+
+    /**
      * 设置评估方法与签字人等信息
      *
      * @param assetsLedgerVO       查询出来的VO信息