From 0e12e4ab45db6768a0f45d8952f78b0ae9190723 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 19 五月 2025 16:09:01 +0800
Subject: [PATCH] 手机号登录，去掉短信验证。脱敏

---
 project-report/src/main/resources/mapper/report/ReportMapper.xml |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/project-report/src/main/resources/mapper/report/ReportMapper.xml b/project-report/src/main/resources/mapper/report/ReportMapper.xml
index 2032c8d..880b521 100644
--- a/project-report/src/main/resources/mapper/report/ReportMapper.xml
+++ b/project-report/src/main/resources/mapper/report/ReportMapper.xml
@@ -13,8 +13,9 @@
             IFNULL(count(order_id),0) as v
         from enforce_order
         where 1=1
+        and check_status>=2
         <if test="deptId != null ">
-            AND apply_dept_id = #{deptId}
+            AND check_dept_id = #{deptId}
         </if>
         <if test="beginTime!=null and beginTime!=''">
             AND apply_time &gt;= #{beginTime}
@@ -34,6 +35,7 @@
         IFNULL(count(order_id),0) as v
         from enforce_order
         where 1=1
+        and check_status>=2
         <if test="beginTime!=null and beginTime!=''">
             AND apply_time &gt;= #{beginTime}
         </if>
@@ -47,16 +49,21 @@
     <select id="getCompanyCount"
             parameterType="com.project.report.domain.bo.query.ReportQueryBo"
             resultType="com.project.common.vo.KeyVal">
+
         select
-        company_id AS k,
-        IFNULL(count(order_id),0) as v
-        from enforce_order
+            sc.company_name AS k,
+            IFNULL(count(eo.order_id),0) as v
+        from sys_company sc
+        left join enforce_order eo on sc.company_id=eo.company_id
         where 1=1
+        and sc.company_status=0
+        and sc.check_status=2
+        and eo.check_status>=2
         <if test="beginTime!=null and beginTime!=''">
-            AND apply_time &gt;= #{beginTime}
+            AND eo.apply_time &gt;= #{beginTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            AND apply_time &lt;= #{endTime}
+            AND eo.apply_time &lt;= #{endTime}
         </if>
         GROUP BY k order by v desc
     </select>
@@ -70,6 +77,7 @@
         IFNULL(count(order_id),0) as v
         from enforce_order
         where 1=1
+          and check_status>=2
         <if test="beginTime!=null and beginTime!=''">
             AND apply_time &gt;= #{beginTime}
         </if>
@@ -89,15 +97,15 @@
         from enforce_complaint_log
         where 1=1
         <if test="beginTime!=null and beginTime!=''">
-            AND apply_time &gt;= #{beginTime}
+            AND complaint_time &gt;= #{beginTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            AND apply_time &lt;= #{endTime}
+            AND complaint_time &lt;= #{endTime}
         </if>
         GROUP BY k
     </select>
 
-    <!--    鎵ф硶绫诲瀷鍒嗗竷-->
+    <!--    鎶曡瘔绫诲瀷鍒嗗竷-->
     <select id="getComplaintTypeCount"
             parameterType="com.project.report.domain.bo.query.ReportQueryBo"
             resultType="com.project.common.vo.KeyVal">
@@ -107,12 +115,12 @@
         from enforce_complaint_log
         where 1=1
         <if test="beginTime!=null and beginTime!=''">
-            AND apply_time &gt;= #{beginTime}
+            AND complaint_time &gt;= #{beginTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            AND apply_time &lt;= #{endTime}
+            AND complaint_time &lt;= #{endTime}
         </if>
-        <if test="doComplaint!=null ">
+        <if test="doComplaint != null ">
             <if test="doComplaint == 0 ">
                 AND complaint_status = 0
             </if>

--
Gitblit v1.9.1