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.yml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 842026d..0f89dc0 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -69,12 +69,14 @@
# Spring閰嶇疆
spring:
+ datasource:
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
active: ls
+
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -114,8 +116,10 @@
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
configLocation: classpath:mybatis/mybatis-config.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ # 娉ㄥ唽鑷畾涔塗ypeHandler鍖�
+ typeHandlersPackage: com.smartor.typehandler
+ #configuration:
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 娌冲崡SSO閰嶇疆锛堜附姘寸敤涓嶅埌锛�
@@ -137,6 +141,10 @@
redirect_uri: "http://172.20.111.142:8096/login"
state: "smartor" # 浣犱滑绯荤粺鏍囪瘑
scope: "openid%20roles%20profile"
+ #鍗曠偣鐧婚檰鐧藉悕鍗旾P閰嶇疆
+ whitelist:
+ ips:
+
# 闃叉XSS鏀诲嚮
xss:
@@ -155,3 +163,16 @@
#鐢ㄦ埛榛樿瀵嗙爜
userPwd: 123456
+
+#杩欎簺绌哄�奸兘鏄潵鏈潵鐨勫彉閲忥紝鍏堝崰浣�
+lwl_app_key:
+sms_accountName:
+sms_password:
+sms_url:
+sms_sourceAddr:
+sms_serviceCode:
+sms_appkey:
+sms_flag:
+
+shurl:
+shversion:
\ No newline at end of file
--
Gitblit v1.9.3