|
@@ -59,7 +59,15 @@ public class TblTaskServiceImpl implements ITblTaskService
|
|
@Override
|
|
@Override
|
|
public List<TblTask> selectTblTaskList(TblTask tblTask)
|
|
public List<TblTask> selectTblTaskList(TblTask tblTask)
|
|
{
|
|
{
|
|
- return tblTaskMapper.selectTblTaskList(tblTask);
|
|
|
|
|
|
+ List<TblTask> taskList = tblTaskMapper.selectTblTaskList(tblTask);
|
|
|
|
+ for (TblTask t:taskList
|
|
|
|
+ ) {
|
|
|
|
+ TblTaskLog taskLog = new TblTaskLog();
|
|
|
|
+ taskLog.setTaskId(t.getTaskId());
|
|
|
|
+ t.setTblTaskLogList( tblTaskLogService.selectTblTaskLogList(taskLog));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return taskList;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|