diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 8ebc0bbb7..0d3bbfbef 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -200,3 +200,7 @@ CREATE TABLE `params_report_export_history` ( `export_file_id` varchar(50) DEFAULT NULL COMMENT '导出文件id', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- 参数清单历史版本 添加字段 +ALTER TABLE `laws_weilai`.`params_manifest_history` + ADD COLUMN `source_params_manifest_id` varchar(50) NULL COMMENT '源参数清单id' AFTER `params_template_publish_version`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 88cada6f2..232eab6f5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -15,8 +15,6 @@ import com.jero.modules.cert.collect.service.IParamsConfigEOService; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.collect.vo.ParamsManifestVO; -import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; -import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -244,15 +242,15 @@ public class ParamsManifestEOController extends JeroController history(@RequestParam(name="title",required=true) String title) { - List historyVersionList = paramsManifestEOService.getHistoryVersionList(title); + public Result history(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId) { + List historyVersionList = paramsManifestEOService.getHistoryVersionList(paramsManifestId); return Result.OK(historyVersionList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java index f32edfa62..8195a357f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java @@ -2,9 +2,11 @@ package com.jero.modules.cert.collect.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -23,4 +25,8 @@ import java.io.Serializable; public class ParamsManifestHistoryEO extends ParamsManifestEO implements Serializable { private static final long serialVersionUID = 1L; + /**版本*/ + @Excel(name = "源参数清单id", width = 15) + @ApiModelProperty(value = "源参数清单id") + private String sourceParamsManifestId; } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml index 803567144..f0ed93178 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index d11b9d640..972245644 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -74,7 +74,7 @@ public interface IParamsManifestEOService extends IService { boolean changeExtension(String id, String cut); - List getHistoryVersionList(String title); + List getHistoryVersionList(String paramsManifestId); IPage getAllManifest(IPage page, String projectName); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java index 3dd20e90b..c66c62790 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java @@ -16,5 +16,5 @@ public interface IParamsManifestHistoryEOService extends IService getHistoryVersionList(String title); + List getHistoryVersionList(String paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 730bc2942..843676384 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; @@ -23,7 +22,6 @@ import com.jero.modules.cert.collect.service.*; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; -import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.service.IParamsTemplateEOService; import com.jero.modules.project.entity.ProjectRelatedPersonnel; @@ -438,8 +436,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl getHistoryVersionList(String title) { - return paramsManifestHistoryEOService.getHistoryVersionList(title); + public List getHistoryVersionList(String paramsManifestId) { + return paramsManifestHistoryEOService.getHistoryVersionList(paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java index ccab4dd24..d5c88999d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java @@ -64,6 +64,7 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); @@ -131,10 +132,10 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl getHistoryVersionList(String title) { + public List getHistoryVersionList(String paramsManifestId) { // 同一项目下标题时唯一的,历史版本和当前版本通过标题进行关联 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsManifestHistoryEO::getTitle, title) + queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId) .orderByAsc(ParamsManifestHistoryEO::getVersion); List list = list(queryWrapper); List historyVersionList = new ArrayList<>();