From bca80202fca7cd7ba46a2015b540fffdcb66e349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 24 Nov 2023 08:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E9=A1=B9=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E4=B8=8E=E7=82=B9=E5=87=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/controller/ExtIndexController.java | 13 ++++----
 .../mapper/index/ExtIndexStatisticsMapper.xml | 31 ++++---------------
 2 files changed, 13 insertions(+), 31 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 7922769d..1f27c63f 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
@@ -241,19 +241,20 @@ public class ExtIndexController extends AbstractController {
 
         log.info("任务提醒入参为{}",pramsMap);
         log.info("首页-任务提醒,params {}", pramsMap);
-        pramsMap.put("dbName", getUserInfo().getDbName());
-        List<String> taxno = getTaxno();
-        if (taxno != null && taxno.size() > 0) {
-            pramsMap.put("taxno", taxno);
+
+
+        try {
             Map<String, Object> map = new HashMap<>(16);
             List<ExtIndexInvoiceTaskRemindingModel> listVO = indexStatisticsService.getInvoiceTaskReminding(pramsMap);
             for (ExtIndexInvoiceTaskRemindingModel vo : listVO) {
                 map.put(vo.getWarningType(), vo.getCountNum());
             }
             return ResponseEntity.ok(R.ok().put("data", map));
-        } else {
-            return ResponseEntity.ok(R.ok().put("data", ""));
+        }catch (Exception e) {
+            return ResponseEntity.ok(R.ok().put("data",""));
         }
+
+
     }
 
     /**
diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
index 8700e249..21a9136d 100644
--- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
@@ -1636,13 +1636,8 @@
         'ycfpWarning' warningType
         from
         t_dx_record_invoice
-        where gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where  gf_tax_no = #{paramsData.gfsh}
+          and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
         and invoice_status != 0
         and invoice_type in ('01','03','08','14','31')
         and company = #{paramsData.company}
@@ -1679,14 +1674,8 @@
         'rzhyc' warningType
         from
         t_dx_record_invoice
-        where
-        gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where gf_tax_no = #{paramsData.gfsh}
+        and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
         and invoice_status != '0'
         and (rzh_yesorno = '1' or rzh_yesorno = '2')
         and invoice_type in ('01','03','08','14','31')
@@ -1702,20 +1691,12 @@
         'qshyc' warningType
         from
         t_dx_record_invoice
-        where
-        gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where   gf_tax_no = #{paramsData.gfsh}
+        and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
         and invoice_status != '0'
         and qs_status = '1'
         and invoice_type in ('01','03','08','14','31')
-
         and company = #{paramsData.company}
-
         and invoice_date between #{paramsData.kpksrq} and #{paramsData.kpjsrq}
     </select>
 <!--&#45;&#45;         and date_format(qs_date,'%Y-%m') = date_format(now(),'%Y-%m')-->