From c15623a135260f0804bd2c5a69fce957f4b30abe Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 08 七月 2025 09:03:53 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
index 9b0b0e2..f41451a 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
@@ -4,15 +4,13 @@
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.utils.SecurityUtils;
-import com.gkhy.exam.system.domain.Catalogue;
-import com.gkhy.exam.system.domain.CatalogueData;
-import com.gkhy.exam.system.domain.CatalogueDataFile;
-import com.gkhy.exam.system.domain.SysCompany;
+import com.gkhy.exam.system.domain.*;
import com.gkhy.exam.system.domain.req.CatalogueDataReq;
import com.gkhy.exam.system.domain.req.CatalogueReq;
import com.gkhy.exam.system.domain.vo.CatalogueDataVo;
import com.gkhy.exam.system.domain.vo.CatalogueVo;
import com.gkhy.exam.system.mapper.CatalogueMapper;
+import com.gkhy.exam.system.mapper.CompanyIndustryTemplateMapper;
import com.gkhy.exam.system.mapper.SysCompanyMapper;
import com.gkhy.exam.system.service.CatalogueService;
import com.gkhy.exam.system.service.SysCompanyService;
@@ -32,6 +30,8 @@
private CatalogueMapper catalogueMapper;
@Autowired
private SysCompanyMapper sysCompanyMapper;
+ @Autowired
+ private CompanyIndustryTemplateMapper companyIndustryTemplateMapper;
/**
* 目录管理
@@ -187,6 +187,11 @@
@Override
public CommonResult insertCatalogueDataFile(CatalogueDataFile catalogueDataFile) {
+ CompanyIndustryTemplate companyIndustryTemplate = companyIndustryTemplateMapper.selectCompanyIndustryTemplate(catalogueDataFile.getName());
+ if (companyIndustryTemplate!=null){
+ catalogueDataFile.setFilePath(companyIndustryTemplate.getFilePath());
+ catalogueDataFile.setFileName(companyIndustryTemplate.getFileName());
+ }
catalogueDataFile.setCreateTime(LocalDate.now());
catalogueDataFile.setCreateBy(SecurityUtils.getUsername());
catalogueMapper.insertCatalogueDataFile(catalogueDataFile);
@@ -195,9 +200,20 @@
@Override
public CommonResult updateCatalogueDataFile(CatalogueDataFile catalogueDataFile) {
+ CompanyIndustryTemplate companyIndustryTemplate = companyIndustryTemplateMapper.selectCompanyIndustryTemplate(catalogueDataFile.getName());
+ if (companyIndustryTemplate!=null){
+ catalogueDataFile.setFilePath(companyIndustryTemplate.getFilePath());
+ catalogueDataFile.setFileName(companyIndustryTemplate.getFileName());
+ }else {
+ catalogueDataFile.setFileName(null);
+ catalogueDataFile.setFilePath(null);
+ }
+ catalogueDataFile.setCreateBy(SecurityUtils.getUsername());
+ catalogueDataFile.setCreateTime(LocalDate.now());
catalogueDataFile.setUpdateBy(SecurityUtils.getUsername());
catalogueDataFile.setUpdateTime(LocalDate.now());
- catalogueMapper.updateCatalogueDataFile(catalogueDataFile);
+ catalogueMapper.deleteByCatalogueDataFileId(catalogueDataFile.getId());
+ catalogueMapper.insertCatalogueDataFile(catalogueDataFile);
return CommonResult.success();
}
--
Gitblit v1.9.2