Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访

陈昶聿

2 天以前 3d047130b059efd46f56be37465a751ab16ee8cb

 ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java

@@ -126,6 +126,7 @@
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.mapper.ext.SysDept2Mapper;
import com.ruoyi.task.api.contract.OperationSubtaskWriter;
import com.ruoyi.task.event.FollowupCompletedEventPublisher;

/**
 * 单一任务（随访）Service业务层处理
@@ -145,6 +146,9 @@
     */
    @Autowired
    private OperationSubtaskWriter operationSubtaskWriter;

    @Autowired
    private FollowupCompletedEventPublisher followupCompletedEventPublisher;

    /**
     * 满意度模块对外门面（常驻 Bean）。
@@ -1544,7 +1548,12 @@
        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 6)
            serviceSubtask.setFinishtime(new Date());

        return serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
        Boolean updated = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
        if (Boolean.TRUE.equals(updated) && serviceSubtask.getSendstate() != null
                && serviceSubtask.getSendstate() == 6 && serviceSubtask.getId() != null) {
            followupCompletedEventPublisher.publish(serviceSubtask.getId());
        }
        return updated;
    }

    @Override
@@ -4883,6 +4892,7 @@
            serviceSubtask.setSendstate(6L);
            serviceSubtask.setPreachform("1");
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
            followupCompletedEventPublisher.publish(serviceSubtask.getId());
        }
    }

@@ -5027,6 +5037,7 @@
        if (subtaskUpdated == 0) {
            throw new BaseException("微信公众号默认完成失败：子任务状态已变化，subid=" + current.getId());
        }
        followupCompletedEventPublisher.publish(current.getId());

        log.info("【微信公众号默认完成】subid：{}，已按默认选项完成，填充题目数：{}", current.getId(), filled);
        return true;