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

fix(项目设置): 项目字段变更导致sql报错

This commit is contained in:
shiziyuan9527 2022-03-08 11:04:43 +08:00 committed by shiziyuan9527
parent 1aa919fd35
commit 1e371ea3da
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
View File

@ -242,7 +242,7 @@
select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority, select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags, test_case.maintainer, test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags, test_case.maintainer,
test_case.custom_fields, test_case.custom_fields,
test_case.node_path, test_case.method, if(project.custom_num = 0, cast(test_case.num as char), test_case.node_path, test_case.method, if(pa.type_value = 'false', cast(test_case.num as char),
test_case.custom_num) as customNum, test_plan_test_case.executor, test_plan_test_case.status, test_case.custom_num) as customNum, test_plan_test_case.executor, test_plan_test_case.status,
test_plan_test_case.actual_result, test_plan_test_case.actual_result,
test_plan_test_case.update_time, test_plan_test_case.create_time,test_case_node.name as model, project.name as test_plan_test_case.update_time, test_plan_test_case.create_time,test_case_node.name as model, project.name as
@ -253,6 +253,7 @@
inner join test_case on test_plan_test_case.case_id = test_case.id inner join test_case on test_plan_test_case.case_id = test_case.id
left join test_case_node on test_case_node.id = test_case.node_id left join test_case_node on test_case_node.id = test_case.node_id
inner join project on project.id = test_case.project_id inner join project on project.id = test_case.project_id
inner join project_application pa on pa.project_id = project.id and pa.type = 'CASE_CUSTOM_NUM'
left join project_version on project_version.id = test_case.version_id and project.id = left join project_version on project_version.id = test_case.version_id and project.id =
project_version.project_id project_version.project_id
<include refid="queryWhereCondition"/> <include refid="queryWhereCondition"/>

3
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
View File

@ -100,7 +100,7 @@
select test_case_review_test_case.id as id, test_case_review_test_case.reviewer, select test_case_review_test_case.id as id, test_case_review_test_case.reviewer,
test_case_review_test_case.update_time, test_case_review_test_case.review_id as reviewId, test_case_review_test_case.update_time, test_case_review_test_case.review_id as reviewId,
test_case.id as caseId, test_case.name, test_case.priority, test_case.test_id as testId, test_case.id as caseId, test_case.name, test_case.priority, test_case.test_id as testId,
test_case.type, test_case.node_path, test_case.method, if(project.custom_num = 0, cast(test_case.num as char), test_case.type, test_case.node_path, test_case.method, if(pa.type_value = 'false', cast(test_case.num as char),
test_case.custom_num) as customNum, test_case.review_status, test_case.custom_num) as customNum, test_case.review_status,
test_case.remark as remark, test_case.maintainer, test_case.steps as steps, test_case.node_id as nodeId, test_case.remark as remark, test_case.maintainer, test_case.steps as steps, test_case.node_id as nodeId,
test_case_node.name as model, test_case_node.name as model,
@ -110,6 +110,7 @@
inner join test_case on test_case_review_test_case.case_id = test_case.id inner join test_case on test_case_review_test_case.case_id = test_case.id
left join test_case_node on test_case_node.id=test_case.node_id left join test_case_node on test_case_node.id=test_case.node_id
inner join project on project.id = test_case.project_id inner join project on project.id = test_case.project_id
inner join project_application pa on project.id = pa.project_id and pa.type = 'CASE_CUSTOM_NUM'
left join project_version on project_version.project_id = project.id and test_case.version_id = project_version.id left join project_version on project_version.project_id = project.id and test_case.version_id = project_version.id
<include refid="queryWhereCondition"/> <include refid="queryWhereCondition"/>
<if test="request.orders != null and request.orders.size() > 0"> <if test="request.orders != null and request.orders.size() > 0">