From b65c4cdd68b72771634fcfd52709edfd77d7abc6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 07 八月 2026 17:47:43 +0800
Subject: [PATCH] 【景宁】发送方式改执行方式
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 36c346d..8e22d35 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -269,6 +269,7 @@
e.printStackTrace();
}
+ findServiceTaskScheduleVO(serviceTaskVO);
return serviceTaskVO;
}
@@ -398,17 +399,7 @@
}
}
serviceTaskVO.setPatTaskRelevances(patTaskRelevances);
- if(StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")){
- //浠诲姟缁勪俊鎭�
- ServiceTaskSchedule schedule = serviceTaskScheduleService.selectByTaskid(serviceTaskVO.getTaskid());
- if (ObjectUtils.isNotEmpty(schedule)) {
- ServiceTaskScheduleVO serviceTaskScheduleVO = DtoConversionUtils.sourceToTarget(schedule, ServiceTaskScheduleVO.class);
- List<ServiceTaskScheduleDetail> scheduleDetailList =
- serviceTaskScheduleService.selectDetailByScheduleid(schedule.getId());
- serviceTaskScheduleVO.setDetailList(scheduleDetailList);
- serviceTaskVO.setServiceTaskScheduleVO(serviceTaskScheduleVO);
- }
- }
+ findServiceTaskScheduleVO(serviceTaskVO);
return serviceTaskVO;
}
@@ -4504,7 +4495,7 @@
if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) {
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setSendstate(5L);
- serviceSubtask.setRemark(remark + ";鎵�鏈夊彂閫佹柟寮忓潎鏈幏鍙栫粨鏋滐紝浠诲姟澶辫触");
+ serviceSubtask.setRemark(remark + ";鎵�鏈夋墽琛屾柟寮忓潎鏈幏鍙栫粨鏋滐紝浠诲姟澶辫触");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
return true;
} else {
@@ -5434,6 +5425,21 @@
return back;
}
+ //鑾峰彇浠诲姟缁勪俊鎭�
+ private void findServiceTaskScheduleVO(ServiceTaskVO serviceTaskVO){
+ if(StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")){
+ //浠诲姟缁勪俊鎭�
+ ServiceTaskSchedule schedule = serviceTaskScheduleService.selectByTaskid(serviceTaskVO.getTaskid());
+ if (ObjectUtils.isNotEmpty(schedule)) {
+ ServiceTaskScheduleVO serviceTaskScheduleVO = DtoConversionUtils.sourceToTarget(schedule, ServiceTaskScheduleVO.class);
+ List<ServiceTaskScheduleDetail> scheduleDetailList =
+ serviceTaskScheduleService.selectDetailByScheduleid(schedule.getId());
+ serviceTaskScheduleVO.setDetailList(scheduleDetailList);
+ serviceTaskVO.setServiceTaskScheduleVO(serviceTaskScheduleVO);
+ }
+ }
+ }
+
@Test
public void TestMatch(){
String questionText = "鎮ㄥソ,璇烽棶鎮ㄦ槸鎮ｈ�呮湰浜鸿繕鏄灞烇紵\n";
--
Gitblit v1.9.3