From b1de9cd1337df0edd02a1fc3e44403c34e2ca1bb Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sat, 6 May 2023 21:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/controller/ExtIndexController.java  |  1 +
 .../mapper/index/ExtIndexStatisticsMapper.xml  | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java
index 8c59cefd..686f164c 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java
@@ -238,6 +238,7 @@ public class ExtIndexController extends AbstractController {
     @PostMapping(URI_INDEX_TASK_REMINDING)
     public ResponseEntity<R> getInvoiceTaskReminding(@RequestParam Map<String, Object> pramsMap) {
 
+        log.info("任务提醒入参为{}",pramsMap);
         log.info("首页-任务提醒,params {}", pramsMap);
         pramsMap.put("dbName", getUserInfo().getDbName());
         List<String> taxno = getTaxno();
diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
index 5c134f37..e4930079 100644
--- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
@@ -1628,9 +1628,9 @@
             </foreach>
         </if>
         and invoice_status != 0
-        and t.invoice_type in ('01','03','08','14','31')
-        and t.company = #{company}
-        and t.invoice_date between #{kpksrq} and #{kpjsrq}
+        and invoice_type in ('01','03','08','14','31')
+        and company = #{company}
+        and invoice_date between #{kpksrq} and #{kpjsrq}
     </select>
 <!--    and DATE_FORMAT( status_update_date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )-->
     <!-- 普票跨年度发票 -->
@@ -1673,9 +1673,9 @@
         </if>
         and invoice_status != '0'
         and auth_status = '4'
-        and t.invoice_type in ('01','03','08','14','31')
-        and t.company = #{company}
-        and t.invoice_date between #{kpksrq} and #{kpjsrq}
+        and invoice_type in ('01','03','08','14','31')
+        and company = #{company}
+        and invoice_date between #{kpksrq} and #{kpjsrq}
     </select>
 <!--    and date_format(rzh_date,'%Y-%m') = date_format(now(),'%Y-%m')-->
     <!-- 签收异常发票 -->
@@ -1697,8 +1697,10 @@
         and invoice_status != '0'
         and qs_status = '1'
         and t.invoice_type in ('01','03','08','14','31')
-        and t.company = #{company}
-        and t.invoice_date between #{kpksrq} and #{kpjsrq}
+        <if test="company != null and company !='' and company != 'null'">
+            and company = #{company}
+        </if>
+        and invoice_date between #{kpksrq} and #{kpjsrq}
     </select>
 <!--&#45;&#45;         and date_format(qs_date,'%Y-%m') = date_format(now(),'%Y-%m')-->