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-quartz/src/main/java/com/ruoyi/quartz/util/CreateDataTable.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CreateDataTable.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CreateDataTable.java
index d8cab10..c711623 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CreateDataTable.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CreateDataTable.java
@@ -220,11 +220,11 @@
// varchar / char / text 绛夊瓧绗︿覆绫诲瀷
if (dataType.contains("char") || dataType.contains("text") || dataType.contains("enum")) {
if (colName.equals("deptcode")) {
- activeParams.add(new Object[]{"p_" + colName, colName, "in", colType});
+ activeParams.add(new Object[]{"p_" + colName, colName, "in", "TEXT"});
break;
}
if (colName.equals("hospitaldistrictcode")) {
- activeParams.add(new Object[]{"p_" + colName, colName, "in", colType});
+ activeParams.add(new Object[]{"p_" + colName, colName, "in", "TEXT"});
break;
}
String kind = forceEqCols.contains(colName) ? "eq" : (eqPattern.matcher(colName).find() ? "eq" : "like");
@@ -268,8 +268,8 @@
line = " IF " + pName + " IS NOT NULL THEN SET @cond=CONCAT(@cond,' AND " + col + "=',QUOTE(" + pName + ")); END IF;";
break;
case "like":
- // MySQL 瀛樺偍杩囩▼鍐� '' 琛ㄧず涓�涓崟寮曞彿
- line = " IF " + pName + " IS NOT NULL THEN SET @cond=CONCAT(@cond,' AND " + col + " LIKE CONCAT(''%''," + pName + ",''%'')'); END IF;";
+ // 蹇呴』鐢� QUOTE() 鎶婂�煎睍寮�鍒板瓧绗︿覆閲岋紝鍚﹀垯 PREPARE 鎵ц鏃跺弬鏁板悕琚綋鍒楀悕
+ line = " IF " + pName + " IS NOT NULL THEN SET @cond=CONCAT(@cond,' AND " + col + " LIKE CONCAT(''%'',',QUOTE(" + pName + "),',''%'')'); END IF;";
break;
case "date_ge":
line = " IF " + pName + " IS NOT NULL THEN SET @cond=CONCAT(@cond,' AND " + col + ">=',QUOTE(" + pName + ")); END IF;";
--
Gitblit v1.9.3