feat(测试跟踪): 修复测试跟踪执行测试计划时实际开始结束时间的变更方式
--bug=1026052 --user=宋天阳 [测试跟踪]github#24285测试跟踪-测试计划实际开始和实际结束时间显示错误 https://www.tapd.cn/55049933/s/1370506
This commit is contained in:
parent
585abe8e56
commit
adc84b9372
|
@ -35,8 +35,6 @@ public interface ExtTestPlanMapper {
|
||||||
|
|
||||||
List<TestPlan> listRecent(@Param("userId") String userId, @Param("projectId") String currentProjectId);
|
List<TestPlan> listRecent(@Param("userId") String userId, @Param("projectId") String currentProjectId);
|
||||||
|
|
||||||
int updateActualEndTimeIsNullById(String testPlanID);
|
|
||||||
|
|
||||||
@MapKey("id")
|
@MapKey("id")
|
||||||
Map<String, ParamsDTO> testPlanTestCaseCount(@Param("planIds") List<String> planIds);
|
Map<String, ParamsDTO> testPlanTestCaseCount(@Param("planIds") List<String> planIds);
|
||||||
|
|
||||||
|
@ -55,4 +53,7 @@ public interface ExtTestPlanMapper {
|
||||||
List<TestPlanDTO> planListAll(@Param("request") QueryTestPlanRequest params);
|
List<TestPlanDTO> planListAll(@Param("request") QueryTestPlanRequest params);
|
||||||
|
|
||||||
Boolean checkSyncTestCaseExecResultByTestPlanId(String testPlanId);
|
Boolean checkSyncTestCaseExecResultByTestPlanId(String testPlanId);
|
||||||
|
|
||||||
|
void updateStatusAndActStartTimeAndSetActEndTimeNullById(@Param("testPlanId") String testPlanId, @Param("actStartTime") long actStartTime, @Param("status") String status);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -320,7 +320,8 @@
|
||||||
SELECT p.name
|
SELECT p.name
|
||||||
FROM test_plan tp
|
FROM test_plan tp
|
||||||
INNER JOIN project p ON p.id = tp.project_id
|
INNER JOIN project p ON p.id = tp.project_id
|
||||||
WHERE tp.id = #{0} limit 1;
|
WHERE tp.id = #{0}
|
||||||
|
limit 1;
|
||||||
</select>
|
</select>
|
||||||
<select id="findIdByPerformanceReportId" resultType="java.lang.String">
|
<select id="findIdByPerformanceReportId" resultType="java.lang.String">
|
||||||
SELECT report.id
|
SELECT report.id
|
||||||
|
@ -418,13 +419,17 @@
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
<update id="updateActualEndTimeIsNullById">
|
<update id="updateStatusAndActStartTimeAndSetActEndTimeNullById">
|
||||||
update test_plan
|
update test_plan
|
||||||
set actual_end_time = null
|
set actual_start_time = #{actStartTime},
|
||||||
where id = #{0}
|
actual_end_time = null,
|
||||||
|
status = #{status}
|
||||||
|
where id = #{testPlanId}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<select id="checkSyncTestCaseExecResultByTestPlanId" resultType="java.lang.Boolean">
|
<select id="checkSyncTestCaseExecResultByTestPlanId" resultType="java.lang.Boolean">
|
||||||
SELECT automatic_status_update FROM test_plan WHERE id = #{0}
|
SELECT automatic_status_update
|
||||||
|
FROM test_plan
|
||||||
|
WHERE id = #{0}
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -1874,12 +1874,7 @@ public class TestPlanService {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateTestPlanExecuteInfo(String testPlanId, String status) {
|
private void updateTestPlanExecuteInfo(String testPlanId, String status) {
|
||||||
TestPlan testPlan = testPlanMapper.selectByPrimaryKey(testPlanId);
|
extTestPlanMapper.updateStatusAndActStartTimeAndSetActEndTimeNullById(testPlanId, System.currentTimeMillis(), status);
|
||||||
if (testPlan != null) {
|
|
||||||
testPlan.setStatus(status);
|
|
||||||
testPlan.setActualEndTime(null);
|
|
||||||
testPlanMapper.updateByPrimaryKey(testPlan);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public RunModeConfigDTO getRunModeConfigDTO(TestPlanRunRequest testplanRunRequest, String
|
public RunModeConfigDTO getRunModeConfigDTO(TestPlanRunRequest testplanRunRequest, String
|
||||||
|
@ -2128,7 +2123,7 @@ public class TestPlanService {
|
||||||
this.verifyPool(testPlan.getProjectId(), runModeConfigDTO);
|
this.verifyPool(testPlan.getProjectId(), runModeConfigDTO);
|
||||||
}
|
}
|
||||||
//测试计划准备执行,取消测试计划的实际结束时间
|
//测试计划准备执行,取消测试计划的实际结束时间
|
||||||
extTestPlanMapper.updateActualEndTimeIsNullById(testPlan.getId());
|
extTestPlanMapper.updateStatusAndActStartTimeAndSetActEndTimeNullById(testPlan.getId(), System.currentTimeMillis(), TestPlanStatus.Underway.name());
|
||||||
executeQueue.put(testPlan.getId(), planReportId);
|
executeQueue.put(testPlan.getId(), planReportId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2301,10 +2296,7 @@ public class TestPlanService {
|
||||||
public String runTestPlanBySchedule(String testPlanId, String projectId, String userId, String triggerMode, String planReportId, String executionWay, String apiRunConfig) {
|
public String runTestPlanBySchedule(String testPlanId, String projectId, String userId, String triggerMode, String planReportId, String executionWay, String apiRunConfig) {
|
||||||
//定时任务执行重新设置实际开始时间
|
//定时任务执行重新设置实际开始时间
|
||||||
if (StringUtils.equals(triggerMode, TriggerMode.SCHEDULE.name())) {
|
if (StringUtils.equals(triggerMode, TriggerMode.SCHEDULE.name())) {
|
||||||
TestPlanWithBLOBs testPlanWithBLOBs = new TestPlanWithBLOBs();
|
extTestPlanMapper.updateStatusAndActStartTimeAndSetActEndTimeNullById(testPlanId, System.currentTimeMillis(), TestPlanStatus.Underway.name());
|
||||||
testPlanWithBLOBs.setId(testPlanId);
|
|
||||||
testPlanWithBLOBs.setActualStartTime(System.currentTimeMillis());
|
|
||||||
testPlanMapper.updateByPrimaryKeySelective(testPlanWithBLOBs);
|
|
||||||
}
|
}
|
||||||
return testPlanExecuteService.runTestPlan(testPlanId, projectId, userId, triggerMode, planReportId, executionWay, apiRunConfig);
|
return testPlanExecuteService.runTestPlan(testPlanId, projectId, userId, triggerMode, planReportId, executionWay, apiRunConfig);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue