From 9a8e73d2c711a2e14317372c2df23f8bf951d0db Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 24 Jan 2025 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                             | 17 +++++++++++++++++
 .../impl/BmsTemplateRecordServiceImpl.java      |  2 +-
 .../mapper/jjh/ent/JDataScreenMapper.xml        | 16 ++++++++--------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 174f6b9..26b8cd1 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -16,11 +16,28 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <version>3.2.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
index 9c0206b..d1c24cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
@@ -258,7 +258,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
                 list2.add(CompletableFuture.runAsync(() -> {
                     batch.forEach(data -> {
                         // 处理每条数据
-                        timingRemindImpl.getContact(data.getCreditCode(), "【问卷调研】尊敬的企业人员您好，苏州工业园区经发委现开展2025年度现代服务业发展调研活动，诚邀您提出宝贵意见和建议，烦请花费1分钟通过问卷星链接 https://www.wjx.cn/vm/wBmJsmc.aspx#  提交反馈（截止日期1月12日）。感谢您的宝贵时间，顺祝新年快乐，万事顺利。【园区经发委】");
+                        timingRemindImpl.getContact(data.getCreditCode(), "您好，在金鸡湖现代服务业品牌管理系统中，您有1条新消息，请及时登录平台进行处理，具体内容为：关于园区总部企业区外分支机构（包括子公司、分公司）营收占总部企业营收比重的摸排，详请登录金鸡湖现代服务业品牌管理系统https://idp.sipac.gov.cn/bms/#/login 首页查看待办事项，感谢支持!");
                     });
                 }));
             }
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
index 52283ae..4613a58 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
@@ -80,14 +80,14 @@ order by a.alert_time desc
         IFNULL(a.gdp_proportion,0) as gdpProportion
         FROM
         j_services_develop a
-        <where>
-            <if test="type == 1 ">
-                YEAR(NOW()) > a.develop_year
-            </if>
-            <if test="type != 1 ">
-                YEAR(NOW()) = a.develop_year
-            </if>
-        </where>
+<!--        <where>-->
+<!--            <if test="type == 1 ">-->
+<!--                YEAR(NOW()) > a.develop_year-->
+<!--            </if>-->
+<!--            <if test="type != 1 ">-->
+<!--                YEAR(NOW()) = a.develop_year-->
+<!--            </if>-->
+<!--        </where>-->
         ORDER BY
         a.develop_year ASC
         LIMIT 5