From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
ruoyi-task/src/main/java/com/ruoyi/task/api/contract/TaskSubtaskApiImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/TaskSubtaskApiImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/TaskSubtaskApiImpl.java
index dc88006..54a73a8 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/TaskSubtaskApiImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/TaskSubtaskApiImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.task.mapper.ServiceSubtaskMapper;
import com.ruoyi.task.service.IServiceSubtaskDetailTraceService;
import com.ruoyi.task.service.IServiceTaskService;
+import com.ruoyi.task.event.FollowupCompletedEventPublisher;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -49,6 +50,9 @@
@Autowired
private IServiceSubtaskDetailTraceService traceService;
+ @Autowired
+ private FollowupCompletedEventPublisher followupCompletedEventPublisher;
+
@Override
public ServiceSubtask getSubtask(Long subId) {
return serviceSubtaskMapper.selectServiceSubtaskById(subId);
@@ -60,8 +64,18 @@
}
@Override
+ public List<ServiceSubtask> findCompletedInhospFollowups(String orgid, List<String> serviceTypes,
+ java.util.Date startTime, int limit) {
+ return serviceSubtaskMapper.selectCompletedInhospFollowups(orgid, serviceTypes, startTime, limit);
+ }
+
+ @Override
public int updateSubtask(ServiceSubtask subtask) {
Boolean updated = serviceSubtaskMapper.updateServiceSubtask(subtask);
+ if (Boolean.TRUE.equals(updated) && subtask.getSendstate() != null
+ && subtask.getSendstate() == 6 && subtask.getId() != null) {
+ followupCompletedEventPublisher.publish(subtask.getId());
+ }
return Boolean.TRUE.equals(updated) ? 1 : 0;
}
--
Gitblit v1.9.3