From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskdeptServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskdeptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskdeptServiceImpl.java
index 1a0497e..c15e8bb 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskdeptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskdeptServiceImpl.java
@@ -4,6 +4,7 @@
import com.smartor.domain.ServiceTaskdept;
import com.smartor.mapper.ServiceTaskdeptMapper;
import com.smartor.service.IServiceTaskdeptService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -67,6 +68,24 @@
}
/**
+ * 鏂板妯℃澘绉戝鍏宠仈
+ *
+ * @param serviceTaskdept 妯℃澘绉戝鍏宠仈
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertOrUpdateServiceTaskdept(ServiceTaskdept serviceTaskdept) {
+ ServiceTaskdept st = new ServiceTaskdept();
+ st.setDeptCode(serviceTaskdept.getDeptCode());
+ st.setTaskId(serviceTaskdept.getTaskId());
+ List<ServiceTaskdept> serviceTaskdepts = selectServiceTaskdeptList(st);
+ if (CollectionUtils.isEmpty(serviceTaskdepts)) {
+ return insertServiceTaskdept(serviceTaskdept);
+ } else {
+ return updateServiceTaskdept(serviceTaskdept);
+ }
+ }
+ /**
* 鎵归噺鍒犻櫎妯℃澘绉戝鍏宠仈
*
* @param ids 闇�瑕佸垹闄ょ殑妯℃澘绉戝鍏宠仈涓婚敭
@@ -87,4 +106,9 @@
public int deleteServiceTaskdeptById(Long id) {
return serviceTaskdeptMapper.deleteServiceTaskdeptById(id);
}
+
+ @Override
+ public int deleteServiceTaskdeptByTaskId(ServiceTaskdept serviceTaskdept) {
+ return serviceTaskdeptMapper.deleteServiceTaskdeptByTaskId(serviceTaskdept);
+ }
}
--
Gitblit v1.9.3