Merge branch 'master' of http://test16.zhongdianyun.com/renjiancai/tasktime.git

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

@@ -52,7 +52,7 @@ public interface TaskDao extends BaseMapper<Task> {
 		    + " AND a.status = #{request.status} "
 		    + "</if>"
 		    + "<if test = 'request.id!=null'> "
-			+ " AND id  like concat(#{request.id},'%') "
+			+ " AND a.id  like concat(#{request.id},'%') "
 			+ "</if>"
 		
 			+ "<if test = 'request.projectId!=null'> "
@@ -65,7 +65,7 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ " AND task_status != 0 "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 5'> "
-			+ " AND now() &gt; #{request.endTime} "
+			+ " AND completeTime() &gt; #{request.endTime} "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 1'> "
 			+ " AND task_status = #{request.taskStatus} "

olive-console/src/main/java/com/zrqx/olive/ttask/service/imp/TaskServiceImpl.java

@@ -143,6 +143,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 			BeanUtils.copyProperties(excelTaskVo, task);
 			task.setTaskStatus(1);
 			task.setTaskType(taskRequest.getTaskType());
+			task.setDepartmentId(taskRequest.getDepartmentId());
 			task.setUpdateTime(new Date());
 			task.setCreateTime(new Date());
 		    task.setStatus(taskRequest.getStatus());