From f88e38dda262f8fb937ea4030e2bc8232d4126f2 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 15 五月 2023 14:27:10 +0800
Subject: [PATCH] 1.司机和配送员统计信息合一 2.修改签收率统计信息接口 3.修改签收数据导出接口

---
 xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml |  100 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 100 insertions(+), 0 deletions(-)

diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
index e5cb986..7d4e14f 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
@@ -132,6 +132,63 @@
         line ASC,
         send_date asc
     </select>
+
+    <select id="signCount" resultType="cn.exrick.xboot.your.entity.OrderStatusCount">
+
+        SELECT
+        CONCAT_WS('',YEAR(send_date),'骞�',MONTH(send_date),'鏈�')sendMonth,
+        DATE(DATE_FORMAT(send_date,'%Y-%m-%d') ) sendDate,
+        car_name,
+        batch,
+        SUM( amount ) amount,
+        SUM( abnormal_sign ) as abnormalSign,
+        SUM( not_sign_count ) as  notSignCount,
+        SUM( sign_count ) as signCount ,
+        CONCAT_WS( '',( FORMAT((SUM( sign_count ) / SUM( amount )),4 ) *100), '%') as proportion,
+        (CASE `batch` WHEN '01娈�' THEN batch ELSE 0 END) as 'oneBatch',
+        (CASE `batch` WHEN '02娈�' THEN batch ELSE 0 END) as 'twoBatch',
+        (CASE `batch` WHEN '03娈�' THEN batch ELSE 0 END) as 'threeBatch',
+        (CASE `batch` WHEN '04娈�' THEN batch ELSE 0 END) as 'fourBatch',
+        (CASE `batch` WHEN '05娈�' THEN batch ELSE 0 END) as 'fiveBatch',
+        user_name as userName,
+        line
+        FROM
+        t_sign
+        <where>
+            1=1
+            <if test="bo.line != null and bo.line != ''" >
+                AND  line = #{bo.line}
+            </if>
+            <if test="bo.carName != null and bo.carName != ''" >
+                AND car_name like  CONCAT ('%',#{bo.carName},'%')
+            </if>
+            <if test="bo.batch != null and bo.batch != ''" >
+                AND  batch = #{bo.batch}
+            </if>
+            <if test="bo.userName != null and bo.userName != ''" >
+                AND  user_name = #{bo.userName}
+            </if>
+            <if test="bo.sendDate != null and bo.sendDate != ''">
+                AND  DATE_FORMAT(send_date,'%Y-%m-%d') = #{bo.sendDate}
+            </if>
+            <if test="bo.sendDateStart != null and bo.sendDateStart != ''">
+                AND send_date >= #{bo.sendDateStart}
+            </if>
+            <if test="bo.sendDateEnd != null and bo.sendDateEnd != ''">
+                AND send_date &lt;= #{bo.sendDateEnd}
+            </if>
+        </where>
+        GROUP BY
+        car_name,
+        send_date,
+        batch,
+        user_name,
+        line
+        ORDER BY
+        line ASC,
+        send_date asc
+    </select>
+
     <select id="signCountNew" resultType="cn.exrick.xboot.your.entity.OrderStatusCount">
         SELECT
         line,
@@ -175,6 +232,49 @@
         car_name,
         batch
     </select>
+    <select id="signCount2New" resultType="cn.exrick.xboot.your.entity.OrderStatusCount">
+        SELECT
+        line,
+        user_name as userName,
+        car_name,SUM(sign_count) as signCount,
+        SUM(amount) as amount,
+        CONCAT_WS( '',( FORMAT((SUM( sign_count ) / SUM( amount )),4 ) *100), '%') as proportion,
+        (CASE `batch` WHEN '01娈�' THEN batch ELSE 0 END) as 'oneBatch',
+        (CASE `batch` WHEN '02娈�' THEN batch ELSE 0 END) as 'twoBatch',
+        (CASE `batch` WHEN '03娈�' THEN batch ELSE 0 END) as 'threeBatch',
+        (CASE `batch` WHEN '04娈�' THEN batch ELSE 0 END) as 'fourBatch',
+        (CASE `batch` WHEN '05娈�' THEN batch ELSE 0 END) as 'fiveBatch'
+        FROM
+        t_sign
+        <where>
+            1=1
+            <if test="bo.line != null and bo.line != ''" >
+                AND  line = #{bo.line}
+            </if>
+            <if test="bo.carName != null and bo.carName != ''" >
+                AND car_name like  CONCAT ('%',#{bo.carName},'%')
+            </if>
+            <if test="bo.batch != null and bo.batch != ''" >
+                AND  batch = #{bo.batch}
+            </if>
+            <if test="bo.userName != null and bo.userName != ''" >
+                AND  user_name = #{bo.userName}
+            </if>
+            <if test="bo.sendDate != null and bo.sendDate != ''">
+                AND  DATE_FORMAT(send_date,'%Y-%m-%d') = #{bo.sendDate}
+            </if>
+            <if test="bo.sendDateStart != null and bo.sendDateStart != ''">
+                AND send_date >= #{bo.sendDateStart}
+            </if>
+            <if test="bo.sendDateEnd != null and bo.sendDateEnd != ''">
+                AND send_date &lt;= #{bo.sendDateEnd}
+            </if>
+        </where>
+        GROUP BY line,
+        user_name,
+        car_name,
+        batch
+    </select>
     <select id="signCountNewTotal" resultType="cn.exrick.xboot.your.entity.OrderStatusCount">
     SELECT
     car_name,

--
Gitblit v1.9.1