fix(测试计划): 修复执行历史列表问题
This commit is contained in:
parent
2e206e0755
commit
36504c28cc
|
@ -12,6 +12,8 @@ public class TestPlanExecuteHisDTO {
|
|||
private String num;
|
||||
@Schema(description = "执行方式")
|
||||
private String triggerMode;
|
||||
@Schema(description = "执行状态")
|
||||
private String execStatus;
|
||||
@Schema(description = "执行结果")
|
||||
private String execResult;
|
||||
@Schema(description = "操作人")
|
||||
|
|
|
@ -465,7 +465,7 @@
|
|||
</select>
|
||||
|
||||
<select id="listHis" resultType="io.metersphere.plan.dto.TestPlanExecuteHisDTO">
|
||||
select tpr.id, from_unixtime(tpr.create_time / 1000, '%Y%m%d%H%i%s') as num, tpr.trigger_mode triggerMode, tpr.exec_status execStatus,
|
||||
select tpr.id, from_unixtime(tpr.create_time / 1000, '%Y%m%d%H%i%s') as num, tpr.trigger_mode triggerMode, tpr.exec_status execStatus, tpr.result_status execResult,
|
||||
tpr.create_user operationUser, tpr.start_time startTime, tpr.end_time endTime, tpr.deleted deleted from test_plan_report tpr
|
||||
where tpr.test_plan_id = #{request.testPlanId}
|
||||
<include refid="filter"/>
|
||||
|
@ -513,9 +513,13 @@
|
|||
<foreach collection="request.filter.entrySet()" index="key" item="values">
|
||||
<if test="values != null and values.size() > 0">
|
||||
<choose>
|
||||
<!-- 执行状态 -->
|
||||
<when test="key == 'execStatus'">
|
||||
and tpr.exec_status in
|
||||
<when test="key == 'triggerMode'">
|
||||
and tpr.trigger_mode in
|
||||
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
||||
</when>
|
||||
<!-- 执行结果 -->
|
||||
<when test="key == 'execResult'">
|
||||
and tpr.result_status in
|
||||
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
||||
</when>
|
||||
</choose>
|
||||
|
|
Loading…
Reference in New Issue