tijao

olive-console/src/main/java/com/zrqx/olive/project/model/ProjectFile.java

@@ -34,7 +34,7 @@ public class ProjectFile {
 	private String size;
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
-	@ApiModelProperty("项目Id")
+	@ApiModelProperty("任务Id")
 	private Integer taskId;
 	
 }

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

@@ -31,6 +31,7 @@ import com.zrqx.olive.ttask.request.TaskRequest;
 import com.zrqx.olive.ttask.service.TaskRecordService;
 import com.zrqx.olive.ttask.service.TaskService;
 import com.zrqx.olive.ttask.vo.ExcelTaskVo;
+import com.zrqx.olive.ttask.vo.TaskRecordVo;
 import com.zrqx.olive.ttask.vo.TaskVo;
 
 import io.swagger.annotations.Api;
@@ -113,11 +114,8 @@ public class TaskController {
 	@ApiOperation(value = "历史记录")
 	@RequestMapping(value = "/recordlist", method = RequestMethod.GET)
 	@ApiImplicitParam(name = "record", value = "搜索历史记录")
-	public CommonResult<List<TaskRecord>> getList(@Validated TaskRecordRequest taskRecordRequest) {
-		QueryWrapper<TaskRecord> qw = new QueryWrapper<>();
-		qw.orderByDesc("upload_time");
-		qw.eq("task_id", taskRecordRequest.getTaskId());
-		List<TaskRecord> list = taskRecordService.list(qw);
+	public CommonResult<List<TaskRecordVo>> getList(@Validated TaskRecordRequest taskRecordRequest) {
+		List<TaskRecordVo> list = taskRecordService.getList(taskRecordRequest);
 		return CommonResult.success(list);
 	}
 	
@@ -207,7 +205,7 @@ public class TaskController {
 					teamService.updateById(team);
 				}
 			}
-
+			form.setTaskId(id);
 			// 保存历史记录
 			record(form, request);
 
@@ -330,7 +328,7 @@ public class TaskController {
 		BeanUtils.copyProperties(task, taskvo);
 		LambdaQueryWrapper<ProjectFile> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
 		if(id != null){
-			lambdaQueryWrapper1.eq(ProjectFile::getProjectId, id);
+			lambdaQueryWrapper1.eq(ProjectFile::getTaskId, id);
         }
 		List<ProjectFile> fileList = projectFileMapper.selectList(lambdaQueryWrapper1);
 		taskvo.setFile(fileList);

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

@@ -12,7 +12,9 @@ import com.zrqx.olive.project.model.Customer;
 import com.zrqx.olive.project.request.QueryCustomerRequest;
 import com.zrqx.olive.ttask.model.Task;
 import com.zrqx.olive.ttask.model.TaskRecord;
+import com.zrqx.olive.ttask.request.TaskRecordRequest;
 import com.zrqx.olive.ttask.request.TaskRequest;
+import com.zrqx.olive.ttask.vo.TaskRecordVo;
 import com.zrqx.olive.ttask.vo.TaskVo;
 
 /**
@@ -30,6 +32,12 @@ import com.zrqx.olive.ttask.vo.TaskVo;
 @Mapper
 public interface TaskRecordDao extends BaseMapper<TaskRecord> {
 	
-	
+	@Select("<script>"
+			+ " select DATE_FORMAT(a.upload_time,'%Y-%m-%d %H:%i:%s')uploadTime,a.type,real_name userName,(select real_name from eb_system_admin where id = assign_User_Id)assignUserName,a.describes from t_task_record a join eb_system_admin b on b.id = a.user_id where 1 = 1 "
+			+ "<if test = 'request.taskId!=null'> "
+			+ " AND task_Id = #{request.taskId} "
+			+ "</if>"
+			+ "</script>")
+	List<TaskRecordVo> getList(@Param("request")TaskRecordRequest taskRecordRequest);
 
 }

olive-console/src/main/java/com/zrqx/olive/ttask/model/TaskRecord.java

@@ -47,7 +47,7 @@ public class TaskRecord implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
     
-    @ApiModelProperty(value = "用户名")
+    @ApiModelProperty(value = "指派用户id")
     private String assignUserId;
     
     @ApiModelProperty(value = "描述")

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

 package com.zrqx.olive.ttask.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.common.PageParamRequest;
 import com.github.pagehelper.PageInfo;
@@ -8,7 +10,9 @@ import com.zrqx.olive.article.request.ArticleSearchRequest;
 import com.zrqx.olive.article.vo.ArticleVo;
 import com.zrqx.olive.ttask.model.Task;
 import com.zrqx.olive.ttask.model.TaskRecord;
+import com.zrqx.olive.ttask.request.TaskRecordRequest;
 import com.zrqx.olive.ttask.request.TaskRequest;
+import com.zrqx.olive.ttask.vo.TaskRecordVo;
 import com.zrqx.olive.ttask.vo.TaskVo;
 
 /**
@@ -26,4 +30,7 @@ import com.zrqx.olive.ttask.vo.TaskVo;
 public interface TaskRecordService extends IService<TaskRecord> {
 	
 	
+	List<TaskRecordVo> getList(TaskRecordRequest taskRecordRequest);
+
+
 }

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

@@ -18,9 +18,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zrqx.olive.ttask.dao.TaskRecordDao;
 import com.zrqx.olive.ttask.model.TaskRecord;
+import com.zrqx.olive.ttask.request.TaskRecordRequest;
 import com.zrqx.olive.ttask.request.TaskRequest;
 import com.zrqx.olive.ttask.service.TaskRecordService;
 import com.zrqx.olive.ttask.service.TaskService;
+import com.zrqx.olive.ttask.vo.TaskRecordVo;
 import com.zrqx.olive.ttask.vo.TaskVo;
 
 /**
@@ -41,6 +43,11 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordDao, TaskRecord
     @Resource
     private TaskRecordDao dao;
 
+	@Override
+	public List<TaskRecordVo> getList(TaskRecordRequest taskRecordRequest) {
+		return dao.getList(taskRecordRequest);
+	}
+
 
    
 }

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

+package com.zrqx.olive.ttask.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zrqx.olive.project.model.ProjectFile;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.annotation.Id;
+
+/**
+ * 任务历史记录管理
+ *  +----------------------------------------------------------------------
+ *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ *  +----------------------------------------------------------------------
+ *  | Copyright (c) 2016~2020 https://www.crmeb.com All rights reserved.
+ *  +----------------------------------------------------------------------
+ *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ *  +----------------------------------------------------------------------
+ *  | Author: CRMEB Team <admin@crmeb.com>
+ *  +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaskRecordVo对象", description="任务历史记录管理")
+public class TaskRecordVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+	@ApiModelProperty("id，新增时不需要填写")
+    private String id;
+    
+    @ApiModelProperty(value = "任务ID")
+    private Integer taskId;
+    
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+    
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+    
+    @ApiModelProperty(value = "指派用户名")
+    private String assignUserName;
+    
+    @ApiModelProperty(value = "描述")
+    private String describes;
+
+    @ApiModelProperty(value = "修改时间")
+    private String uploadTime;
+    
+    @ApiModelProperty(value = "0：关闭 1：确认并指派 2：完成   4：编辑  5：创建")
+    private Integer type;
+    
+    
+
+
+}