认证-参数项收集-bug55574
This commit is contained in:
liyawei
@@ -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`;
|
||||
+3
-5
@@ -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<ParamsManifestEO,
|
||||
/**
|
||||
* 历史版本
|
||||
* 根据标题查询
|
||||
* @param title
|
||||
* @param paramsManifestId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "参数清单-历史版本")
|
||||
@ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
|
||||
@GetMapping(value = "/history")
|
||||
@RequiresPermissions("params:manifest:history")
|
||||
public Result<?> history(@RequestParam(name="title",required=true) String title) {
|
||||
List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
|
||||
public Result<?> history(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId) {
|
||||
List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(paramsManifestId);
|
||||
return Result.OK(historyVersionList);
|
||||
}
|
||||
|
||||
|
||||
+6
@@ -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;
|
||||
}
|
||||
|
||||
+1
@@ -15,5 +15,6 @@
|
||||
<result column="version" property="version" />
|
||||
<result column="project_id" property="projectId" />
|
||||
<result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
|
||||
<result column="source_params_manifest_id" property="sourceParamsManifestId" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+1
-1
@@ -74,7 +74,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
|
||||
|
||||
boolean changeExtension(String id, String cut);
|
||||
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String title);
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
|
||||
|
||||
IPage getAllManifest(IPage page, String projectName);
|
||||
|
||||
|
||||
+1
-1
@@ -16,5 +16,5 @@ public interface IParamsManifestHistoryEOService extends IService<ParamsManifest
|
||||
|
||||
void addForChangeExtension(String paramsManifestId);
|
||||
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String title);
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
|
||||
}
|
||||
|
||||
+2
-4
@@ -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<ParamsManifestEOMap
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String title) {
|
||||
return paramsManifestHistoryEOService.getHistoryVersionList(title);
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
|
||||
return paramsManifestHistoryEOService.getHistoryVersionList(paramsManifestId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -64,6 +64,7 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
|
||||
BeanUtils.copyProperties(paramsManifestEO, paramsManifestHistoryEO);
|
||||
String paramsManifestHistoryId = UUID.randomUUID().toString().replace("-","");
|
||||
paramsManifestHistoryEO.setId(paramsManifestHistoryId);
|
||||
paramsManifestHistoryEO.setSourceParamsManifestId(paramsManifestId); // 绑定 源清单
|
||||
|
||||
// 查询清单下配置
|
||||
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
|
||||
@@ -131,10 +132,10 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String title) {
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
|
||||
// 同一项目下标题时唯一的，历史版本和当前版本通过标题进行关联
|
||||
LambdaQueryWrapper<ParamsManifestHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ParamsManifestHistoryEO::getTitle, title)
|
||||
queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId)
|
||||
.orderByAsc(ParamsManifestHistoryEO::getVersion);
|
||||
List<ParamsManifestHistoryEO> list = list(queryWrapper);
|
||||
List<ParamsManifestHistoryVO> historyVersionList = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user