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

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

@@ -361,7 +361,7 @@ public class TaskController {
 
 		String modelPath = "/opt/upload/tasktime/template" + File.separator + "任务列表.xls";
 		exportExcelTemplate.exportXls(TaskVo.class, modelPath, queryAllList, 0, 1, 0, response, request);
-		return CommonResult.success();
+		return CommonResult.success("200");
 	}
 
 	@ApiOperation(value = "导入任务信息", notes = "导入任务信息")

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

@@ -45,6 +45,9 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "<if test = 'request.taskType!=null'> "
 			+ " AND task_type = #{request.taskType} "
 			+ "</if>"
+			+ "<if test = 'request.status!=null'> "
+		    + " AND a.status = #{request.status} "
+		    + "</if>"
 		
 			+ "<if test = 'request.id!=null'> "
 			+ " AND a.id = #{request.id} "

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

@@ -241,6 +241,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 			//增加工时
 			task.setTaskName(excelTaskVo.getTaskName());
 			task.setWorkingHours(new BigDecimal(excelTaskVo.getHours()));
+			task.setPriority(1);
 			this.save(task);
 
 		}

olive-console/src/main/java/com/zrqx/olive/ttask/vo/TaskVo.java

@@ -73,10 +73,10 @@ public class TaskVo implements Serializable {
 	private String taskDescription;
 
 	@ApiModelProperty(value = "开始日期")
-	private Date startTime;
+	private String startTime;
 
 	@ApiModelProperty(value = "开始日期")
-	private Date endTime;
+	private String endTime;
 
 	@ApiModelProperty(value = "任务状态 0:关闭 1:未完成 2:确认 3 已完成")
 	private Integer taskStatus;
@@ -85,7 +85,7 @@ public class TaskVo implements Serializable {
 	private String taskStatusName;
 
 	@ApiModelProperty(value = "完成时间")
-	private Date completeTime;
+	private String completeTime;
 	
 	@ApiModelProperty(value = "完成人")
 	private String completeName;
@@ -103,10 +103,10 @@ public class TaskVo implements Serializable {
 	private Integer status;
 
 	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
+	private String createTime;
 
 	@ApiModelProperty(value = "创建时间")
-	private Date updateTime;
+	private String updateTime;
 	
 	@ApiModelProperty("附件")
 	private List<ProjectFile> file;