From 350813e3cd0a2c89baee42d602c2bf6ddd33d564 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 04 十一月 2026 14:26:00 +0800
Subject: [PATCH] 【丽水】1、手动创建再次随访去掉nexttaskflag=0限制
---
smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 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..2a421da 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
@@ -1,13 +1,17 @@
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;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 涓撶妗ｆ鐢熸垚閰嶇疆Service涓氬姟灞傚鐞�
@@ -34,6 +38,33 @@
}
@Override
+ public List<PatSpecificArchiveGenerateConfig> selectEffectiveConfigList(String orgid, String campusid)
+ {
+ List<PatSpecificArchiveGenerateConfig> configs =
+ patSpecificArchiveGenerateConfigMapper.selectEffectivePatSpecificArchiveGenerateConfigList(orgid, campusid);
+ if (CollectionUtils.isEmpty(configs))
+ {
+ return Collections.emptyList();
+ }
+
+ // 鏈烘瀯閰嶇疆浼樺厛锛氬瓨鍦ㄦ満鏋勯厤缃椂锛屼笉鍐嶄娇鐢ㄥ叏灞�閰嶇疆锛岄伩鍏嶈鍒欓噸澶嶅懡涓�
+ if (StringUtils.isNotEmpty(orgid))
+ {
+ List<PatSpecificArchiveGenerateConfig> orgConfigs = configs.stream()
+ .filter(config -> orgid.equals(config.getOrgid()))
+ .collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(orgConfigs))
+ {
+ return orgConfigs;
+ }
+ }
+
+ return configs.stream()
+ .filter(config -> StringUtils.isEmpty(config.getOrgid()))
+ .collect(Collectors.toList());
+ }
+
+ @Override
public int insertPatSpecificArchiveGenerateConfig(PatSpecificArchiveGenerateConfig patSpecificArchiveGenerateConfig)
{
patSpecificArchiveGenerateConfig.setCreateTime(DateUtils.getNowDate());
@@ -48,6 +79,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