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/PatSpecificArchiveGenerateConfigServiceImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
index 2510668..80f7810 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
@@ -1,6 +1,7 @@
package com.smartor.service.impl;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.PatSpecificArchiveGenerateConfig;
import com.smartor.mapper.PatSpecificArchiveGenerateConfigMapper;
import com.smartor.service.IPatSpecificArchiveGenerateConfigService;
@@ -48,6 +49,32 @@
}
@Override
+ public int insertOrUpdatePatSpecificArchiveGenerateConfig(PatSpecificArchiveGenerateConfig patSpecificArchiveGenerateConfig)
+ {
+ if (patSpecificArchiveGenerateConfig.getId() != null
+ && patSpecificArchiveGenerateConfigMapper.selectPatSpecificArchiveGenerateConfigById(patSpecificArchiveGenerateConfig.getId()) != null)
+ {
+ patSpecificArchiveGenerateConfig.setUpdateTime(DateUtils.getNowDate());
+ return patSpecificArchiveGenerateConfigMapper.updatePatSpecificArchiveGenerateConfig(patSpecificArchiveGenerateConfig);
+ }
+ else
+ {
+ patSpecificArchiveGenerateConfig.setCreateTime(DateUtils.getNowDate());
+ if (StringUtils.isEmpty(patSpecificArchiveGenerateConfig.getDelFlag()))
+ {
+ patSpecificArchiveGenerateConfig.setDelFlag("0");
+ }
+ return patSpecificArchiveGenerateConfigMapper.insertPatSpecificArchiveGenerateConfig(patSpecificArchiveGenerateConfig);
+ }
+ }
+
+ @Override
+ public int batchDeletePatSpecificArchiveGenerateConfigByIds(Long[] ids)
+ {
+ return patSpecificArchiveGenerateConfigMapper.deletePatSpecificArchiveGenerateConfigByIds(ids);
+ }
+
+ @Override
public int deletePatSpecificArchiveGenerateConfigByIds(Long[] ids)
{
return patSpecificArchiveGenerateConfigMapper.deletePatSpecificArchiveGenerateConfigByIds(ids);
--
Gitblit v1.9.3