From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候,对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            首次待随访待发送(visitCount = 1 && sendstate in (1、2))                                                                                                                                                                                            再次待随访待发送(visitCount > 1 && sendstate in (1、2))                                                                                                                                                                                            首次待随访已发送(visitCount = 1 && sendstate = in (3、7))                                                                                                                                                                                            再次待随访已发送(visitCount > 1 && sendstate = in (3、7))                                                                                                                                                                                            首次已发送(visitCount = 1 && sendstate = 3)                                                                                                                                                                                            再次已发送(visitCount > 1 && sendstate = 3)

---
 ruoyi-admin/src/main/resources/application-huizhou.yml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-huizhou.yml b/ruoyi-admin/src/main/resources/application-huizhou.yml
index d3f1eb9..22140bc 100644
--- a/ruoyi-admin/src/main/resources/application-huizhou.yml
+++ b/ruoyi-admin/src/main/resources/application-huizhou.yml
@@ -6,7 +6,7 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
-        url: jdbc:kingbase8://10.100.1.23:54321/smartor-huizhou?currentSchema=smartor&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000
+        url: jdbc:kingbase8://10.100.1.23:54321/smartor-huizhou?currentSchema=smartor,sys_catalog&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000
         username: smartor
         password: smartor.2025
         driverClassName: com.kingbase8.Driver
@@ -241,3 +241,9 @@
 #鏂囦欢涓婁紶鍦板潃
 fileUpload:
 profile:
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+  helperDialect: postgresql
+  supportMethodsArguments: false
+  params: count=countSql
\ No newline at end of file

--
Gitblit v1.9.3