From ad53e4af4e4e238453d7613530b501540df915e1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 19:12:24 +0800
Subject: [PATCH] 长期任务，BUG处理
---
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java | 4 ++--
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 16 +++++++++-------
ruoyi-admin/src/main/resources/application-druid.yml | 2 +-
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 1 -
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 745cadd..9f56348 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -34,7 +34,7 @@
# password: Hxerp2000
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃鏈湴
- url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_sltd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_xinhua?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: smartor
password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
index fdf98c1..4420f86 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
@@ -40,9 +40,9 @@
private Long taskid;
/**
- * 鏄惁闅愯棌
+ * 鏄惁闅愯棌锛�0涓嶉殣钘� 1闅愯棌
*/
- @ApiModelProperty(value = "鏄惁闅愯棌")
+ @ApiModelProperty(value = "鏄惁闅愯棌锛�0涓嶉殣钘� 1闅愯棌")
private Long ishide;
/**
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 67e0ff6..2bb0a19 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -67,7 +67,7 @@
}
@Override
- public List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp) {
+ public List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp) {
return patMedInhospMapper.selectPatMedInhosp(patMedInhosp);
}
@@ -645,6 +645,7 @@
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ addServiceSubtaskPreachform(serviceSubtask, null);
}
} else {
if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
@@ -680,13 +681,15 @@
}
private Integer addServiceSubtaskPreachform(ServiceSubtask serviceSubtask, String sendstate) {
- //灏唒reachform鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
- String preachform = serviceSubtask.getPreachform();
+ //灏唒reachformDesc鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
+ ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ String preachformDesc = serviceTask.getPreachformDesc();
+
ObjectMapper objectMapper = new ObjectMapper();
- if (org.apache.commons.lang3.StringUtils.isNotEmpty(preachform)) {
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(preachformDesc)) {
List<ServiceSubtaskPreachform> serviceSubtaskPreachformList = null;
try {
- serviceSubtaskPreachformList = objectMapper.readValue(preachform, new TypeReference<List<ServiceSubtaskPreachform>>() {
+ serviceSubtaskPreachformList = objectMapper.readValue(preachformDesc, new TypeReference<List<ServiceSubtaskPreachform>>() {
});
} catch (JsonProcessingException e) {
log.error("preachform杞琇ist<ServiceSubtaskPreachform>鎶ラ敊浜嗭細{}", e.getMessage());
@@ -699,8 +702,7 @@
if (StringUtils.isNotEmpty(sendstate)) serviceSubtaskPreachform.setSendstate(sendstate);
serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
- return serviceSubtaskPreachformMapper.insertServiceSubtaskPreachform(serviceSubtaskPreachform);
-
+ serviceSubtaskPreachformMapper.insertServiceSubtaskPreachform(serviceSubtaskPreachform);
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c9331cd..0979503 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1399,7 +1399,6 @@
SUM(pmiCount) AS pmiCount,
SUM(pmoCount) AS pmoCount
FROM (
- -- 闅忚鏁版嵁
SELECT
<choose>
<when test="timeType == 'day'">
--
Gitblit v1.9.3