From be396e19af86f49cc2c966c73b5f59cd36c7402e Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期二, 09 五月 2023 16:09:15 +0800
Subject: [PATCH] 1.增加手持客户端当天签收率接口 2.增加后端月签收率接口
---
xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml | 54 +++++++++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 29 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 7e2b84c..ea85e3e 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
@@ -21,7 +21,7 @@
sum(abnormal_sign) AS abnormalSign,
sum(not_sign_count) AS notSignCount,
sum(sign_count )AS signCount,
- CONCAT_WS( '',ROUND(AVG(proportion),0), '%') as proportion,
+ ROUND(AVG(proportion),0) as proportionInt,
</if>
<if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '4'.toString()">
YEAR(DATE_FORMAT(DATE_SUB(send_date,INTERVAL 1 DAY),'%Y-%m-%d')) sendDate,
@@ -62,21 +62,16 @@
</if>
</where>
GROUP BY
- <if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '1'.toString()">
- DATE(send_date),
- </if>
- <if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '2'.toString()">
- WEEK(send_date,1),
- </if>
- <if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '3'.toString()">
- MONTH(send_date),
- </if>
- <if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '4'.toString()">
- YEAR(send_date),
- </if>
+ send_date,
car_name,
line,
- batch
+ batch,
+ amount,
+ abnormal_sign,
+ not_sign_count,
+ sign_count,
+ proportion,
+ user_name
ORDER BY
line ASC,
send_date asc
@@ -85,22 +80,22 @@
<select id="signCount" resultType="cn.exrick.xboot.your.entity.OrderStatusCount">
SELECT
- DATE_FORMAT(send_date,'%Y-%m-%d') as sendDate,
+ 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',
- CONCAT_WS('',YEAR(send_date),'骞�',MONTH(send_date),'鏈�')sendMonth,
- amount,
- abnormal_sign as abnormalSign,
- not_sign_count as notSignCount,
- sign_count as signCount ,
- CONCAT_WS( '',ROUND(proportion,0), '%') as proportion,
- car_name,
- line,
- batch,
- user_name as userName
+ user_name as userName,
+ line
FROM
t_sign
<where>
@@ -128,12 +123,13 @@
</if>
</where>
GROUP BY
- DATE(send_date),
car_name,
- line,
- batch
+ send_date,
+ batch,
+ user_name,
+ line
ORDER BY
line ASC,
send_date asc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.1