Merge remote-tracking branch 'origin/master'

heheng

2025-12-03 430477c7e0777531f22fc18dc8906ea75cdc21d9

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java

@@ -16,12 +16,14 @@
import com.gkhy.exam.system.mapper.ProductItemMapper;
import com.gkhy.exam.system.mapper.SysCompanyMapper;
import com.gkhy.exam.system.service.CatalogueService;
import com.gkhy.exam.system.service.ProjectDocumentService;
import com.gkhy.exam.system.service.SysCompanyService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -37,6 +39,8 @@
    private CompanyIndustryTemplateMapper companyIndustryTemplateMapper;
    @Autowired
    private ProductItemMapper productItemMapper;
    @Autowired
    private ProjectDocumentService projectDocumentService;

    /**
     * 目录管理
@@ -76,7 +80,7 @@
            }
        }
        catalogue.setCreateBy(SecurityUtils.getUsername());
        catalogue.setCreateTime(LocalDate.now());
        catalogue.setCreateTime(LocalDateTime.now());
        int insert = catalogueMapper.insert(catalogue);
        if (insert>0){
            return CommonResult.success();
@@ -87,7 +91,7 @@
    @Override
    public CommonResult updateCatalogue(Catalogue catalogue) {
        catalogue.setUpdateBy(SecurityUtils.getUsername());
        catalogue.setUpdateTime(LocalDate.now());
        catalogue.setUpdateTime(LocalDateTime.now());
        int i = catalogueMapper.updateById(catalogue);
        if (i>0){
            return CommonResult.success();
@@ -107,7 +111,7 @@
        Catalogue catalogue = new Catalogue();
        catalogue.setId(catalogueId);
        catalogue.setDelFlag(2);
        catalogue.setUpdateTime(LocalDate.now());
        catalogue.setUpdateTime(LocalDateTime.now());
        catalogue.setUpdateBy(SecurityUtils.getUsername());
        int i = catalogueMapper.updateById(catalogue);
        if (i>0){
@@ -261,6 +265,22 @@
        return CommonResult.success();
    }

    @Override
    public CommonResult selectCatalogueDocumentList(CatalogueReq catalogueReq) {
        List<CatalogueVo> catalogueVos = catalogueMapper.selectCatalogueList(catalogueReq);
        for (CatalogueVo catalogueVo : catalogueVos) {
            List<ProjectDocument> projectDocuments = projectDocumentService.selectList(catalogueVo.getCompanyId(), catalogueReq.getItemId(), catalogueVo.getId(),catalogueReq.getType());
            catalogueVo.setProjectDocuments(projectDocuments);
        }

        List<CatalogueVo> collect = catalogueVos.stream().filter(catalogueVo -> catalogueVo.getParentId() == 0).collect(Collectors.toList());
        for (CatalogueVo catalogueVo : collect) {
            List<CatalogueVo> getchildren = getchildren(catalogueVo, catalogueVos);
            catalogueVo.setChildren(getchildren);
        }
        return CommonResult.success(collect);
    }

    private void saveCatalogue(List<CatalogueVo> children,Catalogue catalogue) {
        for (CatalogueVo child : children) {
            Catalogue catalogue1 = new Catalogue();