1

olive-console/src/main/java/com/zrqx/olive/ttask/controller/TaskController.java

@@ -6,6 +6,7 @@ import com.common.CheckAdminToken;
 import com.common.CommonPage;
 import com.common.CommonResult;
 import com.common.PageParamRequest;
+import com.utils.DateUtils;
 import com.utils.ExportExcelTemplate;
 import com.utils.ExportUtil;
 import com.utils.ImportExcelUtil;
@@ -338,6 +339,8 @@ public class TaskController {
 		Task task = taskService.getById(id);
 		TaskVo taskvo = new TaskVo();
 		BeanUtils.copyProperties(task, taskvo);
+		taskvo.setStartTime(DateUtils.dateTimeToStr(task.getStartTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
+		taskvo.setEndTime(DateUtils.dateTimeToStr(task.getEndTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
 		LambdaQueryWrapper<ProjectFile> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
 		if (id != null) {
 			lambdaQueryWrapper1.eq(ProjectFile::getTaskId, id);

olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java

@@ -31,7 +31,7 @@ import com.zrqx.olive.ttask.vo.TaskVo;
 public interface TaskDao extends BaseMapper<Task> {
 	
 	@Select("<script>"
-			+ " select tt.* from (SELECT a.*,(select account from eb_system_admin c where a.user_id = c.id) userName, "
+			+ " select tt.* from (SELECT a.*,(select real_name from eb_system_admin c where a.user_id = c.id) userName, "
 			+ " (case when task_type = 1 then '项目任务' when task_type = 2 then 'BUG任务' when task_type = 3 then '部门任务' else '' end) taskTypeName,"  
 			+ " (case when task_status = 0 then '关闭' when task_status = 1 then '未完成' when task_status = 2 then '已完成' end) taskStatusName,    "
 			+ " (select account from t_task_record e LEFT JOIN eb_system_admin f on e.user_id = f.id   where  e.type = 3 and e.task_id = a.id)  completeName"