From f5412313edae1ffae3d5471e5eca8dde4695f0d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 07 十一月 2025 17:46:35 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 8 ++++++++
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 2 +-
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 7 ++++---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 1 +
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 3 +++
7 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 70fcd3b..37030a9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -403,7 +403,7 @@
if (StringUtils.isNotEmpty(data) && data.contains("result=0")) {
s = "true";
} else {
- setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�", "5");
+ setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�: " + data, "5");
throw new BaseException("鐭俊鍙戦�佸け璐�");
}
}
diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
index 62daf6f..65f42ed 100644
--- a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
+++ b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
@@ -12,7 +12,7 @@
<!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
<setting name="defaultExecutorType" value="SIMPLE"/>
<!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
- <setting name="logImpl" value="STDOUT_LOGGING"/>
+<!-- <setting name="logImpl" value="STDOUT_LOGGING"/>-->
<!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
</settings>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java
index 764936c..06d48f6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java
@@ -25,7 +25,7 @@
com.ruoyi.common.dx.SmsService service = new SmsService();
SmsServiceSoap soap = service.getSmsServiceSoap();
String result = soap.i5GSend("202508291634227086", "T202508291635259440", UUID.randomUUID().toString(), sMessageContent, sMessageType, sUserNumber, sScheduleTime);
- log.info("----鐭俊杩斿洖鐨勬暟鎹负锛歿}", result);
+ log.info("----鐭俊杩斿洖鐨勬暟鎹负锛歿}, ----sMessageContent鐨勫�间负:{},", result, sMessageContent);
return result;
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 5730755..def5cf1 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -192,6 +192,14 @@
private Date senddate;
/**
+ * 鏂扮殑鍒涘缓鏃堕棿锛堢敤鏉ュ仛鏌ヨ鍙傛暟鐢級
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏂扮殑鍒涘缓鏃堕棿")
+ private Date createTimeNew;
+
+ /**
* 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
*/
@Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index b418568..737b13d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -721,6 +721,7 @@
ServiceSubtask ss = new ServiceSubtask();
ss.setTaskid(Long.valueOf(taskId));
ss.setPatid(serviceSubtask.getPatid());
+ ss.setCreateTimeNew(new Date());
List<Integer> list = serviceSubtaskMapper.selectSendstateByCondition(ss);
if (CollectionUtils.isNotEmpty(list)) return true;
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index 6bbc751..ea78762 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -508,10 +508,11 @@
}
List<Map<String, String>> mapList = new ArrayList<>();
- for (Map<String, String> map : ivrTaskMap.values()) {
- mapList.add(map);
+ if (ivrTaskMap != null) {
+ for (Map<String, String> map : ivrTaskMap.values()) {
+ mapList.add(map);
+ }
}
-
//灏嗘ā鏉块棶棰樿瘽鏈噷鐨勯�氶厤绗︽浛鎹�
for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index ef7deab..c9331cd 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -478,6 +478,9 @@
JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
<where>b.taskid = #{taskid}
and b.patid = #{patid}
+ <if test="createTime != null and createTime != ''">
+ DATE_FORMAT(b.create_time, '%Y-%m-%d') LIKE CONCAT(#{createTimeNew}, '%')
+ </if>
<if test="sendstate != null ">and b.sendstate = #{sendstate}</if>
</where>
</select>
--
Gitblit v1.9.3