From f99d902db3c31e57229439962abd2746bb06868d Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期三, 02 七月 2025 16:33:23 +0800 Subject: [PATCH] 新增 --- multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java | 2 + multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java | 23 ++++++++++- multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysIndustryTypeController.java | 3 + multi-system/src/main/resources/mapper/system/CatalogueMapper.xml | 31 ++++++++++++--- multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java | 6 ++ multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java | 22 +++++----- multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueDataReq.java | 2 7 files changed, 67 insertions(+), 22 deletions(-) diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysIndustryTypeController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysIndustryTypeController.java index 798df2a..4ea3ec6 100644 --- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysIndustryTypeController.java +++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysIndustryTypeController.java @@ -22,7 +22,7 @@ * 行业类型列表 * @return */ - @ApiOperation(value = "行业类型列表") + @ApiOperation(value = "行业类型列表分页") @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"), @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10") @@ -32,6 +32,7 @@ return CommonResult.success(service.selectIndustryTypeList()); } + @ApiOperation(value = "行业类型列表") @GetMapping("/listAll") public CommonResult listIndustryTypeAll(){ return CommonResult.success(service.selectList()); diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java index 389b383..8d7905e 100644 --- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java +++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java @@ -285,17 +285,17 @@ public CommonResult deletedCatalogueData(@RequestParam("catalogueDataId") Integer catalogueDataId){ return catalogueService.deletedCatalogueData(catalogueDataId); } -// -// /** -// * 目录数据文件列表 -// * @param catalogueReq -// * @return -// */ -// @ApiOperation(value = "目录数据文件列表") -// @GetMapping("/catalogueData/list") -// public CommonResult listCatalogueDataFile(CatalogueReq catalogueReq){ -// return CommonResult.success(catalogueService.selectCatalogueDataList(catalogueReq)); -// } + + /** + * 目录数据文件列表 + * @param catalogueReq + * @return + */ + @ApiOperation(value = "目录数据文件列表") + @GetMapping("/catalogueDataFile/list") + public CommonResult listCatalogueDataFile(CatalogueReq catalogueReq){ + return CommonResult.success(catalogueService.selectCatalogueDataFileList(catalogueReq)); + } /** diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueDataReq.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueDataReq.java index 42f0c28..f96e3d9 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueDataReq.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueDataReq.java @@ -14,7 +14,7 @@ @Data public class CatalogueDataReq { - private String id; + private Integer id; private Integer catalogueId; private Integer companyId; 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 37a37f0..26bd066 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 @@ -28,5 +28,9 @@ List<CatalogueDataFile> selectCatalogueDataFile(@Param("companyId") Integer companyId, @Param("catalogueId") Integer catalogueId); - List<CatalogueData> selectByCompanyId(Integer companyId); + List<CatalogueData> selectByCompanyId(@Param("companyId") Integer companyId, @Param("catalogueId") Integer catalogueId); + + CatalogueData selectCatalogueDataById(@Param("catalogueDataId") Integer catalogueDataId); + + void updateCatalogueDataFileByCompanyId(CatalogueDataFile catalogueDataFile); } diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java index b88fdf2..5d433ca 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java @@ -33,4 +33,6 @@ CommonResult updateCatalogueDataFile(CatalogueDataFile catalogueDataFile); CommonResult deletedCatalogueDataFile(Integer dataFileId); + + CommonResult selectCatalogueDataFileList(CatalogueReq catalogueReq); } 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 27065f4..9b0b0e2 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 @@ -124,12 +124,16 @@ @Override public CommonResult insertCatalogueData(CatalogueDataReq catalogue) { - List<CatalogueData> catalogueData1 = catalogueMapper.selectByCompanyId(catalogue.getCompanyId()); + //校验 + List<CatalogueData> catalogueData1 = catalogueMapper.selectByCompanyId(catalogue.getCompanyId(),catalogue.getCatalogueId()); if (catalogueData1.size()>0){ return CommonResult.failed("当前企业已有数据,请勿重复添加"); } CatalogueData catalogueData = new CatalogueData(); BeanUtils.copyProperties(catalogue,catalogueData); + catalogueData.setCreateBy(SecurityUtils.getUsername()); + catalogueData.setCreateTime(LocalDate.now()); + //新增数据 Integer i = catalogueMapper.insertCatalogueData(catalogueData); // List<CatalogueDataFile> files = catalogue.getFiles(); if (i>0){ @@ -159,13 +163,23 @@ @Override public CommonResult deletedCatalogueData(Integer catalogueDataId) { + //删除数据所属文件 + CatalogueData catalogue = catalogueMapper.selectCatalogueDataById(catalogueDataId); + CatalogueDataFile catalogueDataFile = new CatalogueDataFile(); + catalogueDataFile.setCompanyId(catalogue.getCompanyId()); + catalogueDataFile.setCatalogueId(catalogue.getCatalogueId()); + catalogueDataFile.setDelFlag(2); + catalogueDataFile.setUpdateTime(LocalDate.now()); + catalogueDataFile.setUpdateBy(SecurityUtils.getUsername()); + catalogueMapper.updateCatalogueDataFileByCompanyId(catalogueDataFile); + //删除数据 CatalogueData catalogueData = new CatalogueData(); catalogueData.setId(catalogueDataId); catalogueData.setDelFlag(2); catalogueData.setUpdateBy(SecurityUtils.getUsername()); catalogueData.setUpdateTime(LocalDate.now()); Integer i = catalogueMapper.updateCatalogueData(catalogueData); - if (i>9){ + if (i>0){ return CommonResult.success(); } return CommonResult.failed(); @@ -197,4 +211,9 @@ catalogueMapper.updateCatalogueDataFile(catalogueDataFile); return CommonResult.success(); } + + @Override + public CommonResult selectCatalogueDataFileList(CatalogueReq catalogueReq) { + return CommonResult.success(catalogueMapper.selectCatalogueDataFile(catalogueReq.getCompanyId(),catalogueReq.getCatalogueId())); + } } diff --git a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml index 170cccb..5855d20 100644 --- a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml +++ b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml @@ -17,7 +17,7 @@ <update id="updateCatalogueData"> UPDATE `catalogue_data` - SET + <set> <if test="companyId!=null"> `company_id` = #{companyId}, </if> @@ -27,24 +27,25 @@ <if test="content!=null and content!=''"> `content` = #{content}, </if> - <if test="analysic!=null and analysic!=''"> + <if test="analysis!=null and analysis!=''"> `analysis` = #{analysis}, </if> <if test="delFlag!=null and delFlag!=''"> `del_flag` = #{delFlag}, </if> - <if test="updateBy!=null and update!=''"> + <if test="updateBy!=null and updateBy!=''"> `update_by` = #{updateBy}, </if> <if test="updateTime!=null"> `update_time` = #{updateTime} </if> + </set> WHERE `id` = #{id} </update> <update id="updateCatalogueDataFile"> UPDATE `catalogue_data_file` - set + <set> <if test="catalogueId!=null"> `catalogue_id` = #{catalogueId}, </if> @@ -72,7 +73,11 @@ <if test="updateTime != null" > update_time = #{updateTime} </if> + </set> where id = #{id} + </update> + <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> <select id="selectCatalogueList" resultType="com.gkhy.exam.system.domain.vo.CatalogueVo"> @@ -141,7 +146,6 @@ SELECT `id`, `company_id`, - name, `catalogue_id`, `content`, `analysis`, @@ -152,7 +156,22 @@ `update_time` FROM catalogue_data - where company_id = #{companyId} and del_flag = 1 + where company_id = #{companyId} and del_flag = 1 and catalogue_id = #{catalogueId} </select> + <select id="selectCatalogueDataById" resultType="com.gkhy.exam.system.domain.CatalogueData"> + SELECT + `id`, + `company_id`, + `catalogue_id`, + `content`, + `analysis`, + `del_flag`, + `create_by`, + `create_time`, + `update_by`, + `update_time` + FROM + catalogue_data where del_flag = 1 and id=#{catalogueDataId} + </select> </mapper> -- Gitblit v1.9.2