From 33e1839c6214ad72cc5a76ae254ce0bb542e9263 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 09:31:11 +0800
Subject: [PATCH] 提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 25e9f60..bcca0f4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -14,7 +14,6 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.sms.smsUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
@@ -23,11 +22,7 @@
import com.smartor.common.MtSubmitSmUtil;
import com.smartor.common.ScheduleSubtaskBuilder;
import com.smartor.config.PhoneUtils;
-import com.smartor.domain.DTO.MydTrendReqDTO;
-import com.smartor.domain.DTO.MzMydScoreRankDTO;
-import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
-import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
-import com.smartor.domain.DTO.ServiceSubtaskOptionStatDTO;
+import com.smartor.domain.DTO.*;
import com.smartor.domain.*;
import com.smartor.domain.VO.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -5985,10 +5980,42 @@
Date newDate = new Date();
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
+ // 闄㈠尯锛�/scanGenerateSubtask 鏄尶鍚嶆帴鍙ｏ紙SecurityConfig permitAll锛夛紝鍙栦笉鍒扮櫥褰曠敤鎴凤紱
+ // 鑰� service_task.campusid 鍦ㄦ湰搴撴槸鍗犱綅鍊� '1'锛岀洿鎺ユ部鐢ㄤ細璁╃粺璁℃帴鍙ｏ紙@AddOrgId 鎸夐櫌鍖鸿繃婊わ級鏌ヤ笉鍒版暟鎹��
+ // 杩欓噷鐢ㄤ换鍔￠厤缃殑鐥呭尯锛堝叾娆＄瀹わ級鍙嶆煡 sys_dept.campusid 钀藉簱锛屼繚璇侀棶鍗风粺璁¤兘鎸夐櫌鍖哄彇鍒般��
+ String campusIdByDept = queryCampusIdByDeptCode(serviceSubtask.getLeavehospitaldistrictcode(), serviceTask.getOrgid());
+ if (StringUtils.isEmpty(campusIdByDept)) {
+ campusIdByDept = queryCampusIdByDeptCode(serviceSubtask.getDeptcode(), serviceTask.getOrgid());
+ }
+ if (StringUtils.isNotEmpty(campusIdByDept)) {
+ serviceSubtask.setCampusid(campusIdByDept);
+ }
+ // 鍙厤浜嗙瀹わ紙娌℃湁鐥呭尯锛夌殑婊℃剰搴︿换鍔★細杩欓亾绛斿嵎鍦ㄦ寜鐥呭尯绛涢�夌殑鎶ヨ〃閲岀粺璁′笉鍒帮紝鐣欐棩蹇椾究浜庤繍缁村彂鐜�
+ if (StringUtils.isEmpty(serviceSubtask.getLeavehospitaldistrictcode())
+ && ("6".equals(serviceSubtask.getServiceType()) || "14".equals(serviceSubtask.getServiceType()))) {
+ log.warn("銆愭壂鐮佺敓鎴愪换鍔°�戞弧鎰忓害瀛愪换鍔℃病鏈夌梾鍖猴紝鎸夌梾鍖虹瓫閫夌殑鎶ヨ〃灏嗙粺璁′笉鍒拌绛斿嵎锛歵askid={}, deptcode={}, campusid={}",
+ serviceSubtask.getTaskid(), serviceSubtask.getDeptcode(), serviceSubtask.getCampusid());
+ }
return serviceSubtask;
}
/**
+ * 鎸夌瀹�/鐥呭尯缂栫爜鍙嶆煡鎵�灞為櫌鍖猴紙鏌ヤ笉鍒拌繑鍥� null锛�
+ */
+ private String queryCampusIdByDeptCode(String deptCode, String orgid) {
+ if (StringUtils.isEmpty(deptCode)) {
+ return null;
+ }
+ try {
+ SysDept sysDept = sysDept2Mapper.selectDeptByCode(deptCode, orgid);
+ return sysDept == null ? null : sysDept.getCampusid();
+ } catch (Exception e) {
+ log.warn("鎸夌紪鐮佸弽鏌ラ櫌鍖哄け璐ワ細deptCode={}, orgid={}, err={}", deptCode, orgid, e.getMessage());
+ return null;
+ }
+ }
+
+ /**
* Ai 鍖归厤閫夐」
*
* @param questionText
--
Gitblit v1.9.3