From 2bba48672c0e3a0146c2ad766a080846b05038f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 8 Dec 2020 18:43:41 +0800 Subject: [PATCH] fix --- .../performance/dao/ResultTaskMapper.java | 33 +++ .../performance/dao/TaskCommentMapper.java | 33 +++ .../dao/TaskProcessRecordMapper.java | 33 +++ .../performance/entity/ResultTask.java | 160 ++++++++++++ .../performance/entity/TaskComment.java | 234 ++++++++++++++++++ .../performance/entity/TaskProcessRecord.java | 179 ++++++++++++++ .../service/ResultTaskService.java | 33 +++ .../service/TaskCommentService.java | 33 +++ .../service/TaskProcessRecordService.java | 33 +++ .../service/impl/ResultTaskServiceImpl.java | 63 +++++ .../service/impl/TaskCommentServiceImpl.java | 63 +++++ .../impl/TaskProcessRecordServiceImpl.java | 63 +++++ .../mapper/performance/ResultTaskMapper.xml | 83 +++++++ .../mapper/performance/TaskCommentMapper.xml | 103 ++++++++ .../performance/TaskProcessRecordMapper.xml | 88 +++++++ src/test/java/com/lz/mysql/MysqlMain.java | 5 +- 16 files changed, 1237 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java create mode 100644 src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java create mode 100644 src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java create mode 100644 src/main/java/com/lz/modules/performance/entity/ResultTask.java create mode 100644 src/main/java/com/lz/modules/performance/entity/TaskComment.java create mode 100644 src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java create mode 100644 src/main/java/com/lz/modules/performance/service/ResultTaskService.java create mode 100644 src/main/java/com/lz/modules/performance/service/TaskCommentService.java create mode 100644 src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java create mode 100644 src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java create mode 100644 src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java create mode 100644 src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java create mode 100644 src/main/resources/mapper/performance/ResultTaskMapper.xml create mode 100644 src/main/resources/mapper/performance/TaskCommentMapper.xml create mode 100644 src/main/resources/mapper/performance/TaskProcessRecordMapper.xml diff --git a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java new file mode 100644 index 00000000..e602501d --- /dev/null +++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java @@ -0,0 +1,33 @@ +package com.lz.modules.performance.dao; +/** +*
+* 任务表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.performance.entity.ResultTask; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface ResultTaskMapper extends BaseMapper+* 任务评论表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.performance.entity.TaskComment; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface TaskCommentMapper extends BaseMapper+* 任务进度更新表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.performance.entity.TaskProcessRecord; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface TaskProcessRecordMapper extends BaseMapper+*
*任务表 +* @author quyixiao +* @since 2020-12-08 +*/ + +@Data +@TableName("lz_result_task") +@ApiModel(value = "任务表") +public class ResultTask implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除状态,1:删除,0:有效 + @ApiModelProperty(value = "是否删除状态,1:删除,0:有效", name = "isDelete") + private Integer isDelete; + //创建时间 + @ApiModelProperty(value = "创建时间", name = "gmtCreate") + private Date gmtCreate; + //最后修改时间 + @ApiModelProperty(value = "最后修改时间", name = "gmtModified") + private Date gmtModified; + //任务名称 + @ApiModelProperty(value = "任务名称", name = "name") + private String name; + //lz_result_detail 的id + @ApiModelProperty(value = "lz_result_detail 的id", name = "detailId") + private Long detailId; + //任务的当前进度 + @ApiModelProperty(value = "任务的当前进度", name = "processRate") + private BigDecimal processRate; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 是否删除状态,1:删除,0:有效 + * @return + */ + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除状态,1:删除,0:有效 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + /** + * 创建时间 + * @return + */ + public Date getGmtCreate() { + return gmtCreate; + } + /** + * 创建时间 + * @param gmtCreate + */ + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + /** + * 最后修改时间 + * @return + */ + public Date getGmtModified() { + return gmtModified; + } + /** + * 最后修改时间 + * @param gmtModified + */ + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + /** + * 任务名称 + * @return + */ + public String getName() { + return name; + } + /** + * 任务名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * lz_result_detail 的id + * @return + */ + public Long getDetailId() { + return detailId; + } + /** + * lz_result_detail 的id + * @param detailId + */ + public void setDetailId(Long detailId) { + this.detailId = detailId; + } + + /** + * 任务的当前进度 + * @return + */ + public BigDecimal getProcessRate() { + return processRate; + } + /** + * 任务的当前进度 + * @param processRate + */ + public void setProcessRate(BigDecimal processRate) { + this.processRate = processRate; + } + + @Override + public String toString() { + return "ResultTask{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + ",detailId=" + detailId + + ",processRate=" + processRate + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/entity/TaskComment.java b/src/main/java/com/lz/modules/performance/entity/TaskComment.java new file mode 100644 index 00000000..27de9f35 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/entity/TaskComment.java @@ -0,0 +1,234 @@ +package com.lz.modules.performance.entity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; +/** +*+*
*任务评论表 +* @author quyixiao +* @since 2020-12-08 +*/ + +@Data +@TableName("lz_task_comment") +@ApiModel(value = "任务评论表") +public class TaskComment implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除状态,1:删除,0:有效 + @ApiModelProperty(value = "是否删除状态,1:删除,0:有效", name = "isDelete") + private Integer isDelete; + //创建时间 + @ApiModelProperty(value = "创建时间", name = "gmtCreate") + private Date gmtCreate; + //最后修改时间 + @ApiModelProperty(value = "最后修改时间", name = "gmtModified") + private Date gmtModified; + //任务id + @ApiModelProperty(value = "任务id", name = "taskId") + private Long taskId; + //0表示对所有评论,1表示对单个具体的detail做评论 + @ApiModelProperty(value = "0表示对所有评论,1表示对单个具体的detail做评论", name = "type") + private Integer type; + // + @ApiModelProperty(value = "", name = "detailId") + private Long detailId; + //lz_result_record表id + @ApiModelProperty(value = "lz_result_record表id", name = "resultRecordId") + private Long resultRecordId; + //评论人员 + @ApiModelProperty(value = "评论人员", name = "staffId") + private Long staffId; + //评论内容 + @ApiModelProperty(value = "评论内容", name = "content") + private String content; + //评论人员名称 + @ApiModelProperty(value = "评论人员名称", name = "staffName") + private String staffName; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 是否删除状态,1:删除,0:有效 + * @return + */ + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除状态,1:删除,0:有效 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + /** + * 创建时间 + * @return + */ + public Date getGmtCreate() { + return gmtCreate; + } + /** + * 创建时间 + * @param gmtCreate + */ + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + /** + * 最后修改时间 + * @return + */ + public Date getGmtModified() { + return gmtModified; + } + /** + * 最后修改时间 + * @param gmtModified + */ + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + /** + * 任务id + * @return + */ + public Long getTaskId() { + return taskId; + } + /** + * 任务id + * @param taskId + */ + public void setTaskId(Long taskId) { + this.taskId = taskId; + } + + /** + * 0表示对所有评论,1表示对单个具体的detail做评论 + * @return + */ + public Integer getType() { + return type; + } + /** + * 0表示对所有评论,1表示对单个具体的detail做评论 + * @param type + */ + public void setType(Integer type) { + this.type = type; + } + + /** + * + * @return + */ + public Long getDetailId() { + return detailId; + } + /** + * + * @param detailId + */ + public void setDetailId(Long detailId) { + this.detailId = detailId; + } + + /** + * lz_result_record表id + * @return + */ + public Long getResultRecordId() { + return resultRecordId; + } + /** + * lz_result_record表id + * @param resultRecordId + */ + public void setResultRecordId(Long resultRecordId) { + this.resultRecordId = resultRecordId; + } + + /** + * 评论人员 + * @return + */ + public Long getStaffId() { + return staffId; + } + /** + * 评论人员 + * @param staffId + */ + public void setStaffId(Long staffId) { + this.staffId = staffId; + } + + /** + * 评论内容 + * @return + */ + public String getContent() { + return content; + } + /** + * 评论内容 + * @param content + */ + public void setContent(String content) { + this.content = content; + } + + /** + * 评论人员名称 + * @return + */ + public String getStaffName() { + return staffName; + } + /** + * 评论人员名称 + * @param staffName + */ + public void setStaffName(String staffName) { + this.staffName = staffName; + } + + @Override + public String toString() { + return "TaskComment{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",taskId=" + taskId + + ",type=" + type + + ",detailId=" + detailId + + ",resultRecordId=" + resultRecordId + + ",staffId=" + staffId + + ",content=" + content + + ",staffName=" + staffName + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java new file mode 100644 index 00000000..58f7704f --- /dev/null +++ b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java @@ -0,0 +1,179 @@ +package com.lz.modules.performance.entity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +/** +*+*
*任务进度更新表 +* @author quyixiao +* @since 2020-12-08 +*/ + +@Data +@TableName("lz_task_process_record") +@ApiModel(value = "任务进度更新表") +public class TaskProcessRecord implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除状态,1:删除,0:有效 + @ApiModelProperty(value = "是否删除状态,1:删除,0:有效", name = "isDelete") + private Integer isDelete; + //创建时间 + @ApiModelProperty(value = "创建时间", name = "gmtCreate") + private Date gmtCreate; + //最后修改时间 + @ApiModelProperty(value = "最后修改时间", name = "gmtModified") + private Date gmtModified; + //当前进度 + @ApiModelProperty(value = "当前进度", name = "processRate") + private BigDecimal processRate; + //更新说明 + @ApiModelProperty(value = "更新说明", name = "remark") + private String remark; + //操作标签 + @ApiModelProperty(value = "操作标签", name = "label") + private String label; + //1,修改名称,2修改进度 ,3名称和进度都修改 + @ApiModelProperty(value = "1,修改名称,2修改进度 ,3名称和进度都修改", name = "type") + private Integer type; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 是否删除状态,1:删除,0:有效 + * @return + */ + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除状态,1:删除,0:有效 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + /** + * 创建时间 + * @return + */ + public Date getGmtCreate() { + return gmtCreate; + } + /** + * 创建时间 + * @param gmtCreate + */ + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + /** + * 最后修改时间 + * @return + */ + public Date getGmtModified() { + return gmtModified; + } + /** + * 最后修改时间 + * @param gmtModified + */ + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + /** + * 当前进度 + * @return + */ + public BigDecimal getProcessRate() { + return processRate; + } + /** + * 当前进度 + * @param processRate + */ + public void setProcessRate(BigDecimal processRate) { + this.processRate = processRate; + } + + /** + * 更新说明 + * @return + */ + public String getRemark() { + return remark; + } + /** + * 更新说明 + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } + + /** + * 操作标签 + * @return + */ + public String getLabel() { + return label; + } + /** + * 操作标签 + * @param label + */ + public void setLabel(String label) { + this.label = label; + } + + /** + * 1,修改名称,2修改进度 ,3名称和进度都修改 + * @return + */ + public Integer getType() { + return type; + } + /** + * 1,修改名称,2修改进度 ,3名称和进度都修改 + * @param type + */ + public void setType(Integer type) { + this.type = type; + } + + @Override + public String toString() { + return "TaskProcessRecord{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",processRate=" + processRate + + ",remark=" + remark + + ",label=" + label + + ",type=" + type + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java new file mode 100644 index 00000000..960494e7 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -0,0 +1,33 @@ +package com.lz.modules.performance.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.performance.entity.ResultTask; + +/** +*+* 任务表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ +public interface ResultTaskService extends IService+* 任务评论表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ +public interface TaskCommentService extends IService+* 任务进度更新表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ +public interface TaskProcessRecordService extends IService+* 任务表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ + +@Service +public class ResultTaskServiceImpl extends ServiceImpl+* 任务评论表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ + +@Service +public class TaskCommentServiceImpl extends ServiceImpl+* 任务进度更新表 服务类 +*
+* +* @author quyixiao +* @since 2020-12-08 +*/ + +@Service +public class TaskProcessRecordServiceImpl extends ServiceImpl