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 +++++++++++++++++++++-----
multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml | 23 +++++++++++++++++++++++
multi-system/src/main/resources/mapper/system/CatalogueMapper.xml | 3 +++
multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java | 2 ++
multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.java | 2 ++
5 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java
index 26bd066..e624086 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java
@@ -33,4 +33,6 @@
CatalogueData selectCatalogueDataById(@Param("catalogueDataId") Integer catalogueDataId);
void updateCatalogueDataFileByCompanyId(CatalogueDataFile catalogueDataFile);
+
+ void deleteByCatalogueDataFileId(@Param("id") Integer id);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.java
index ec0aa5d..c35af5c 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.java
@@ -15,4 +15,6 @@
int updateCompanyIndustryTemplateById(CompanyIndustryTemplate template);
int insertIndustrys(@Param("companyIndustryTemplates") List<CompanyIndustryTemplate> companyIndustryTemplates);
+
+ CompanyIndustryTemplate selectCompanyIndustryTemplate(@Param("name") String name);
}
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();
}
diff --git a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml
index b502a74..9b34e41 100644
--- a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml
@@ -79,6 +79,9 @@
<update id="updateCatalogueDataFileByCompanyId">
UPDATE catalogue_data_file set del_flag = #{delFlag} ,update_by = #{updateBy} , update_time=#{updateTime} where company_id =#{companyId} and catalogue_id = #{catalogueId}
</update>
+ <delete id="deleteByCatalogueDataFileId">
+ DELETE FROM catalogue_data_file WHERE id = #{id}
+ </delete>
<select id="selectCatalogueList" resultType="com.gkhy.exam.system.domain.vo.CatalogueVo">
SELECT
diff --git a/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml b/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
index 17d8961..5106e1c 100644
--- a/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
@@ -100,4 +100,27 @@
END AS UNSIGNED
) ASC
</select>
+ <select id="selectCompanyIndustryTemplate"
+ resultType="com.gkhy.exam.system.domain.CompanyIndustryTemplate">
+ SELECT
+ `id`,
+ `company_id`,
+ `company_name`,
+ chapter,
+ `type`,
+ `template_name`,
+ `industry_type`,
+ `file_path`,
+ `file_name`,
+ `format`,
+ `del_flag`,
+ `create_by`,
+ `create_time`,
+ `update_by`,
+ `update_time`
+ FROM
+ company_industry_template
+ WHERE
+ del_flag = 0 and template_name = #{name}
+ </select>
</mapper>
--
Gitblit v1.9.2