From 84fd23e5e865bd5529441a0c318809a00362f44c Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 18 三月 2024 16:15:03 +0800
Subject: [PATCH] 添加签收图片对比功能

---
 xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 7d4e14f..e2d22d7 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
@@ -119,7 +119,7 @@
                 AND send_date >= #{bo.sendDateStart}
             </if>
             <if test="bo.sendDateEnd != null and bo.sendDateEnd != ''">
-                AND send_date &lt;= #{bo.sendDateEnd}
+                AND send_date &lt;= #{bo.sendDateEnd} + ' 23:59:59'
             </if>
         </where>
         GROUP BY
@@ -204,9 +204,10 @@
         FROM
         t_sign
         <where>
-            1=1
+            1=1 AND
+            car_name is not NULL
             <if test="bo.line != null and bo.line != ''" >
-                AND  line = #{bo.line}
+                AND  line like  CONCAT ('%', #{bo.line},'%')
             </if>
             <if test="bo.carName != null and bo.carName != ''" >
                 AND car_name like  CONCAT ('%',#{bo.carName},'%')
@@ -238,6 +239,7 @@
         user_name as userName,
         car_name,SUM(sign_count) as signCount,
         SUM(amount) as amount,
+        SUM(not_sign_count) as not_sign_count,
         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',
@@ -247,9 +249,10 @@
         FROM
         t_sign
         <where>
-            1=1
+            1=1 AND
+            car_name is not NULL
             <if test="bo.line != null and bo.line != ''" >
-                AND  line = #{bo.line}
+                AND  line like  CONCAT ('%', #{bo.line},'%')
             </if>
             <if test="bo.carName != null and bo.carName != ''" >
                 AND car_name like  CONCAT ('%',#{bo.carName},'%')
@@ -282,9 +285,10 @@
     FROM
     t_sign
     <where>
-        1=1
+        1=1 AND
+        car_name is not NULL
         <if test="bo.line != null and bo.line != ''" >
-            AND  line = #{bo.line}
+            AND  line like  CONCAT ('%', #{bo.line},'%')
         </if>
         <if test="bo.carName != null and bo.carName != ''" >
             AND car_name like  CONCAT ('%',#{bo.carName},'%')

--
Gitblit v1.9.1