提交

olive-console/src/main/java/com/zrqx/olive/project/dao/TeamMemberRelationDao.java

@@ -15,7 +15,7 @@ import com.zrqx.olive.project.vo.TeamMemberListVo;
 @Mapper
 public interface TeamMemberRelationDao extends BaseMapper<TeamMemberRelation> {
 	@Select("<script>"
-			+ "SELECT t1.id,t2.account,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
+			+ "SELECT t2.id,t2.account,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
 			+ "from t_team_member_relation t1 " 
 			+ "INNER JOIN eb_system_admin t2 on t1.account_id=t2.id "   
 			+ "INNER JOIN sys_department t4 on t2.department_id=t4.id where 1=1"

olive-console/src/main/java/com/zrqx/olive/ttask/request/TaskRecordRequest.java

+package com.zrqx.olive.ttask.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.data.annotation.Id;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务管理 Request
+ * +---------------------------------------------------------------------- |
+ * 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 = "TaskRecordRequest对象", description = "任务历史记录表")
+public class TaskRecordRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	
+
+	@ApiModelProperty(value = "任务ID")
+	private Integer taskId;
+
+	@ApiModelProperty(value = "用户ID")
+	private Integer userId;
+
+	@ApiModelProperty(value = "用户名")
+	private String assignUserId;
+
+	@ApiModelProperty(value = "描述")
+	private String describes;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date uploadTime;
+
+	@ApiModelProperty(value = "0：关闭 1：确认并指派 2：完成   4：编辑  5：创建")
+	private Integer type;
+
+	@ApiModelProperty(value = "任务id集合")
+	private List<Integer> ids;
+}