From cb0ad16513708473728ac2007703882c215c4151 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 22 Nov 2024 11:22:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=8A=A5=E8=A1=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加配送质量报表
---
 .../report/mapper/QualityDispatchNumberMapper.xml    | 12 ++++++------
 .../logpm/report/query/QualityDispatchTaskQuery.java |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
index 05df28991..abafc4aa8 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
@@ -27,12 +27,12 @@
                count(distinct t.plan_reservation_code)                                                customerCount,
                count(distinct case when t.review_num != 0 then t.plan_reservation_code else null end) reviewCustomerCount,
                concat(replace(case
-                                  when count(distinct case when t.review_num != 0 then t.plan_reservation_code else null end) =
+                                  when count(distinct t.plan_reservation_code) =
                                        0 then 0
-                                  else ROUND((count(distinct t.plan_reservation_code) / count(distinct case
-                                                                                                           when t.review_num != 0
-                                                                                                               then t.plan_reservation_code
-                                                                                                           else null end)) *
+                                  else ROUND((count(distinct case
+        when t.review_num != 0
+        then t.plan_reservation_code
+        else null end) / count(distinct t.plan_reservation_code) ) *
                                              100, 2) end, '.00',
                               ''), '%')                                                               reviewRate
         from (select t.business_unit,
@@ -197,7 +197,7 @@
         <if test="query.deliveryType != null and query.deliveryType != ''">
         ,t.type
         </if>
-        ,sum(t.num)
+        ,sum(t.num) exceptionNum
         from (select dl.warehouse_name,
         <if test="query.deliveryType != null and query.deliveryType != ''">
                      case when dl.type = 1 then '商配' else '市配' end type,
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/query/QualityDispatchTaskQuery.java b/blade-service/logpm-report/src/main/java/com/logpm/report/query/QualityDispatchTaskQuery.java
index d5ed8d4db..6210e5cbb 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/query/QualityDispatchTaskQuery.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/query/QualityDispatchTaskQuery.java
@@ -3,6 +3,7 @@ package com.logpm.report.query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.support.Query;
 
 /**
@@ -11,6 +12,7 @@ import org.springblade.core.mp.support.Query;
  * @author zhaoqiaobo
  * @create 2024-03-13 14:21
  */
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "配送质量报表查询对象", description = "配送质量报表查询对象")
 @Data
 public class QualityDispatchTaskQuery extends Query {