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

fix: (测试计划) 修复 测试计划-修改状态后时间显示有误 (#1291)

This commit is contained in:
Coooder-X 2021-02-01 14:26:51 +08:00 committed by GitHub
parent 63d4a7ad81
commit 7aa5a6fc5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -168,20 +168,35 @@ public class TestPlanService {
public int editTestPlan(TestPlanDTO testPlan) {
editTestPlanProject(testPlan);
testPlan.setUpdateTime(System.currentTimeMillis());
checkTestPlanExist(testPlan);
//进行中状态，写入实际开始时间
if (TestPlanStatus.Underway.name().equals(testPlan.getStatus())) {
testPlan.setActualStartTime(System.currentTimeMillis());
} else if (TestPlanStatus.Completed.name().equals(testPlan.getStatus())) {
//已完成，写入实际完成时间
testPlan.setActualEndTime(System.currentTimeMillis());
TestPlan res = testPlanMapper.selectByPrimaryKey(testPlan.getId()); // 先查一次库
if (!res.getStatus().equals(testPlan.getStatus())) { // 若有改变才更新时间
res.setUpdateTime(System.currentTimeMillis());
if (TestPlanStatus.Underway.name().equals(testPlan.getStatus())) {
if (res.getStatus().equals(TestPlanStatus.Prepare.name())) {
res.setActualStartTime(System.currentTimeMillis());
} // 未开始->进行中，写入实际开始时间
else if (res.getStatus().equals(TestPlanStatus.Completed.name())) {
res.setActualEndTime(null);
} // 已完成->进行中，结束时间置空
}
else if (!res.getStatus().equals(TestPlanStatus.Prepare.name()) &&
testPlan.getStatus().equals(TestPlanStatus.Prepare.name())) {
res.setActualStartTime(null);
res.setActualEndTime(null);
} // 非未开始->未开始，时间都置空
else if (TestPlanStatus.Completed.name().equals(testPlan.getStatus()) &&
!TestPlanStatus.Completed.name().equals(res.getStatus())) {
//已完成，写入实际完成时间
res.setActualEndTime(System.currentTimeMillis());
}
res.setStatus(testPlan.getStatus());
}
List<String> userIds = new ArrayList<>();
userIds.add(testPlan.getPrincipal());
AddTestPlanRequest testPlans = new AddTestPlanRequest();
int i = testPlanMapper.updateByPrimaryKeySelective(testPlan);
int i = testPlanMapper.updateByPrimaryKey(res); // 更新
if (!StringUtils.isBlank(testPlan.getStatus())) {
BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId()));
String context = getTestPlanContext(testPlans, NoticeConstants.Event.UPDATE);

12
frontend/src/business/components/track/plan/components/TestPlanList.vue
View File

@ -257,7 +257,17 @@ export default {
statusChange(param) {
this.$post('/test/plan/edit', param, () => {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].id == param.id) {
if (this.tableData[i].id == param.id) { // 手动修改当前状态后，前端结束时间先用当前时间，等刷新后变成后台数据（相等）
if (this.tableData[i].status !== "Completed" && param.status === "Completed") {
this.tableData[i].actualEndTime = new Date();
} // 非完成->已完成，结束时间=null
else if (this.tableData[i].status !== "Underway" && param.status === "Underway") {
this.tableData[i].actualStartTime = new Date();
this.tableData[i].actualEndTime = "";
} // 非进行中->进行中，结束时间=null
else if (this.tableData[i].status !== "Prepare" && param.status === "Prepare") {
this.tableData[i].actualStartTime = this.tableData[i].actualEndTime = "";
} // 非未开始->未开始，结束时间=null
this.tableData[i].status = param.status;
break;
}