test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(项目管理): 日志跳转用例详情页 

--bug=1037239 --user=王旭 【项目管理】批量复制功能用例-项目管理日志查看-点击名称跳转应该跳转至用例详情页 https://www.tapd.cn/55049933/s/1490496
This commit is contained in:
WangXu10 2024-04-08 16:18:10 +08:00 committed by 刘瑞斌
parent 53b72d7517
commit 8e2a08a18b
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java
View File

@ -200,7 +200,7 @@ public class FunctionalCaseService {
//记录日志
FunctionalCaseHistoryLogDTO historyLogDTO = getImportLogModule(functionalCase);
saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.ADD.name(), OperationLogModule.CASE_MANAGEMENT_CASE_CREATE);
saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.ADD.name(), OperationLogModule.FUNCTIONAL_CASE);
return functionalCase;
}
@ -420,7 +420,7 @@ public class FunctionalCaseService {
//获取变更历史数量数量
OperationHistoryExample operationHistoryExample = new OperationHistoryExample();
List<String> types = List.of(OperationLogType.ADD.name(), OperationLogType.IMPORT.name(), OperationLogType.UPDATE.name());
List<String> modules = List.of(OperationLogModule.CASE_MANAGEMENT_CASE_CREATE, OperationLogModule.CASE_MANAGEMENT_CASE_UPDATE);
List<String> modules = List.of(OperationLogModule.FUNCTIONAL_CASE);
operationHistoryExample.createCriteria().andSourceIdEqualTo(functionalCaseDetailDTO.getId()).andTypeIn(types).andModuleIn(modules);
functionalCaseDetailDTO.setHistoryCount((int) operationHistoryMapper.countByExample(operationHistoryExample));
@ -834,7 +834,7 @@ public class FunctionalCaseService {
historyLogDTO.setCustomFields(customFields);
historyLogDTO.setCaseAttachments(caseAttachments);
historyLogDTO.setFileAssociationList(fileAssociationList);
saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.ADD.name(), OperationLogModule.CASE_MANAGEMENT_CASE_CREATE);
saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.ADD.name(), OperationLogModule.FUNCTIONAL_CASE);
}
}
}
@ -1092,7 +1092,7 @@ public class FunctionalCaseService {
List<FunctionalCaseCustomField> customFields = functionalCaseCustomFieldMapper.selectByExample(fieldExample);
FunctionalCaseHistoryLogDTO historyLogDTO = new FunctionalCaseHistoryLogDTO(functionalCase, caseBlob, customFields, new ArrayList<>(), new ArrayList<>());
saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.IMPORT.name(), OperationLogModule.CASE_MANAGEMENT_CASE_CREATE);
saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.IMPORT.name(), OperationLogModule.FUNCTIONAL_CASE);
}
@ -1223,7 +1223,7 @@ public class FunctionalCaseService {
//记录新值
FunctionalCaseHistoryLogDTO modifiedLogDTO = getImportLogModule(functionalCase);
//记录日志
saveImportDataLog(functionalCase, originalValue, modifiedLogDTO, userId, organizationId, OperationLogType.IMPORT.name(), OperationLogModule.CASE_MANAGEMENT_CASE_UPDATE);
saveImportDataLog(functionalCase, originalValue, modifiedLogDTO, userId, organizationId, OperationLogType.IMPORT.name(), OperationLogModule.FUNCTIONAL_CASE);
}
private void addStatusIds(List<String> caseIds, FunctionalCase functionalCase, FunctionalCaseExcelData functionalCaseExcelData) {

2
backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OperationHistoryRequest.java
View File

@ -33,7 +33,7 @@ public class OperationHistoryRequest extends BasePageRequest implements Serializ
private List<String> types;
@Schema(description = "操作模块")
private List<String> modules;
private String modules;
}

7
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseOperationHistoryMapper.xml
View File

@ -62,11 +62,8 @@
#{type}
</foreach>
</if>
<if test="request.modules != null and request.modules.size() > 0">
AND operation_history.`module` in
<foreach collection="request.modules" item="module" open="(" close=")" separator=",">
#{module}
</foreach>
<if test="request.modules != null and request.modules !=''">
AND operation_history.`module` like CONCAT('%',#{request.modules},'%')
</if>
</where>
</select>

2
frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseChangeHistory.vue
View File

@ -147,7 +147,7 @@
setLoadListParams({
projectId: appStore.currentProjectId,
sourceId: props.sourceId,
modules: ['API_TEST_MANAGEMENT_CASE'],
modules: 'API_TEST_MANAGEMENT_CASE',
types: typeFilter.value,
});
loadList();

2
frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabChangeHistory.vue
View File

@ -238,7 +238,7 @@
projectId: appStore.currentProjectId,
sourceId: props.caseId,
types: ['IMPORT', 'ADD', 'UPDATE'],
modules: ['CASE_MANAGEMENT_CASE_CREATE', 'CASE_MANAGEMENT_CASE_UPDATE'],
modules: 'CASE_MANAGEMENT_CASE',
});
await loadList();
featureCaseStore.getCaseCounts(props.caseId);