Merge branch 'master' into smartor_ls_261103

陈昶聿

7 天以前 2867cf7076a584a34e63174cec0a8b89cdd03e4c

 ruoyi-patarchive/src/main/java/com/ruoyi/patarchive/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java

@@ -5,10 +5,13 @@
import com.ruoyi.patarchive.domain.PatSpecificArchiveGenerateConfig;
import com.ruoyi.patarchive.mapper.PatSpecificArchiveGenerateConfigMapper;
import com.ruoyi.patarchive.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业务层处理
@@ -35,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());