Unverified Commit fab6ef58 authored by zhu-mingye's avatar zhu-mingye Committed by GitHub

[Optimization][admin] The task version was not deleted after deleting the task (#782)

parent 8fd47134
...@@ -29,13 +29,11 @@ import com.dlink.assertion.Asserts; ...@@ -29,13 +29,11 @@ import com.dlink.assertion.Asserts;
import com.dlink.db.service.impl.SuperServiceImpl; import com.dlink.db.service.impl.SuperServiceImpl;
import com.dlink.dto.CatalogueTaskDTO; import com.dlink.dto.CatalogueTaskDTO;
import com.dlink.mapper.CatalogueMapper; import com.dlink.mapper.CatalogueMapper;
import com.dlink.model.Catalogue; import com.dlink.model.*;
import com.dlink.model.JobLifeCycle;
import com.dlink.model.Statement;
import com.dlink.model.Task;
import com.dlink.service.CatalogueService; import com.dlink.service.CatalogueService;
import com.dlink.service.StatementService; import com.dlink.service.StatementService;
import com.dlink.service.TaskService; import com.dlink.service.TaskService;
import com.dlink.service.TaskVersionService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -59,6 +57,9 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata ...@@ -59,6 +57,9 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
@Autowired @Autowired
private StatementService statementService; private StatementService statementService;
@Autowired
private TaskVersionService taskVersionService;
@Override @Override
public List<Catalogue> getAllData() { public List<Catalogue> getAllData() {
return this.list(); return this.list();
...@@ -132,6 +133,10 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata ...@@ -132,6 +133,10 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
if (isNotNull(catalogue.getTaskId())) { if (isNotNull(catalogue.getTaskId())) {
taskService.removeById(catalogue.getTaskId()); taskService.removeById(catalogue.getTaskId());
statementService.removeById(catalogue.getTaskId()); statementService.removeById(catalogue.getTaskId());
List<TaskVersion> taskVersionList = taskVersionService.getTaskVersionByTaskId(catalogue.getTaskId());
if(taskVersionList.size() > 0 ){
taskVersionService.removeByIds(taskVersionList);
}
} }
this.removeById(id); this.removeById(id);
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment