From 9c7ff52aef5dc4845b2d507d530c6c5cf18f2491 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 13 二月 2023 17:16:07 +0800
Subject: [PATCH] 增加功能

---
 xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 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 6ff70ab..ea85e3e 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
@@ -80,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>
@@ -123,16 +123,11 @@
             </if>
         </where>
         GROUP BY
-         send_date,
         car_name,
-        line,
+        send_date,
         batch,
-        amount,
-        abnormal_sign,
-        not_sign_count,
-        sign_count,
-        proportion,
-        user_name
+        user_name,
+        line
         ORDER BY
         line ASC,
         send_date asc

--
Gitblit v1.9.1