From bbc232fa481177b42097638d82b642e377fbde73 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 11:30:31 +0800 Subject: [PATCH 1/4] fix --- .../lz/modules/app/controller/ResultRecordController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index ba4c5767..d73d28d6 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -25,6 +25,7 @@ import com.lz.modules.flow.model.*; import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; @@ -1335,6 +1336,7 @@ public class ResultRecordController extends AbstractController { @ApiOperation("导出绩效详情报表") @GetMapping("/recordDetailExport") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = RecordDetailExportResp.class)}) public R recordDetailExport(Long recordId){ RecordDetailExportResp resp = new RecordDetailExportResp(); Map map = Maps.newHashMap(); @@ -1343,7 +1345,9 @@ public class ResultRecordController extends AbstractController { if(respnse.isSuccess()){ ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data"); //chartResultService.selectLevelDetailList(req); + // TODO 暂时按照详情页面数据返回 + resp.setRecortModelDtos(resultRecordDetailDto.getRecortModelDtos()); } return R.ok().put("data",resp); @@ -1351,6 +1355,7 @@ public class ResultRecordController extends AbstractController { @ApiOperation("保存绩效详情报表计划") @PostMapping("/recordDetailExplan") + @ApiResponses({@ApiResponse(code = 200,message = "成功")}) public R recordDetailExport(@RequestBody List reqs){ if(CollectionUtils.isEmpty(reqs)){ return R.error("添加数据为空"); From baa126f16f4887db9d2b26c1e7793b6fa76cbaad 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 17:29:43 +0800 Subject: [PATCH 2/4] fix --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 601025b9..90c5f587 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1291,7 +1291,7 @@ public class ResultRecordController extends AbstractController { recordFile.setIsDelete(1); recordFileService.updateRecordFileById(recordFile); return R.ok(); - }lzresultrecord/saveDetail + } /** From c6cf46407af57b1a66b6cd1be06a8d6ee9663f26 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 8 Dec 2020 18:22:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/2020_12_08_sql | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/resources/2020_12_08_sql diff --git a/src/main/resources/2020_12_08_sql b/src/main/resources/2020_12_08_sql new file mode 100644 index 00000000..4c6b54c5 --- /dev/null +++ b/src/main/resources/2020_12_08_sql @@ -0,0 +1,47 @@ +ALTER TABLE `lz_management`.`lz_result_detail` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '进度' AFTER `model_id`; + + + + +CREATE TABLE `lz_result_task` ( + `id` bigint(11) NOT NULL AUTO_INCREMENT, + `is_delete` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除状态，1：删除，0：有效', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后修改时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2289 DEFAULT CHARSET=utf8mb4 COMMENT='任务表'; + + + + + +CREATE TABLE `lz_task_comment` ( + `id` bigint(11) NOT NULL AUTO_INCREMENT, + `is_delete` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除状态，1：删除，0：有效', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后修改时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2289 DEFAULT CHARSET=utf8mb4 COMMENT='任务评论表'; + + + +CREATE TABLE `lz_task_process_record` ( + `id` bigint(11) NOT NULL AUTO_INCREMENT, + `is_delete` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除状态，1：删除，0：有效', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后修改时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2289 DEFAULT CHARSET=utf8mb4 COMMENT='任务进度更新表'; + + + +ALTER TABLE `lz_management`.`lz_result_task` ADD COLUMN `name` text COMMENT '任务名称' AFTER `gmt_modified`, ADD COLUMN `detail_id` int(11) DEFAULT 0 COMMENT 'lz_result_detail 的id' AFTER `name`, ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '任务的当前进度' AFTER `detail_id`; + + + + +ALTER TABLE `lz_management`.`lz_task_comment` ADD COLUMN `task_id` int(11) DEFAULT 0 COMMENT '任务id' AFTER `gmt_modified`, ADD COLUMN `type` int(11) DEFAULT 0 COMMENT '0表示对所有评论，1表示对单个具体的detail做评论' AFTER `task_id`, ADD COLUMN `detail_id` int(11) AFTER `type`, ADD COLUMN `result_record_id` int(11) DEFAULT 0 COMMENT 'lz_result_record表id' AFTER `detail_id`, ADD COLUMN `staff_id` int(11) DEFAULT 0 COMMENT '评论人员' AFTER `result_record_id`, ADD COLUMN `content` text COMMENT '评论内容' AFTER `staff_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '评论人员名称' AFTER `content`; + + + +ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '当前进度' AFTER `gmt_modified`, ADD COLUMN `remark` text COMMENT '更新说明' AFTER `process_rate`, ADD COLUMN `label` text COMMENT '操作标签' AFTER `remark`, ADD COLUMN `type` int(11) DEFAULT 3 COMMENT '1，修改名称，2修改进度 ，3名称和进度都修改' AFTER `label`; \ No newline at end of file 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 4/4] 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 { + + + ResultTask selectResultTaskById(@Param("id") Long id); + + + Long insertResultTask(ResultTask resultTask); + + + int updateResultTaskById(ResultTask resultTask); + + + int updateCoverResultTaskById(ResultTask resultTask); + + + int deleteResultTaskById(@Param("id") Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java new file mode 100644 index 00000000..75cdc4e4 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.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.TaskComment; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface TaskCommentMapper extends BaseMapper { + + + TaskComment selectTaskCommentById(@Param("id") Long id); + + + Long insertTaskComment(TaskComment taskComment); + + + int updateTaskCommentById(TaskComment taskComment); + + + int updateCoverTaskCommentById(TaskComment taskComment); + + + int deleteTaskCommentById(@Param("id") Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java new file mode 100644 index 00000000..2ad075b5 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.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.TaskProcessRecord; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface TaskProcessRecordMapper extends BaseMapper { + + + TaskProcessRecord selectTaskProcessRecordById(@Param("id") Long id); + + + Long insertTaskProcessRecord(TaskProcessRecord taskProcessRecord); + + + int updateTaskProcessRecordById(TaskProcessRecord taskProcessRecord); + + + int updateCoverTaskProcessRecordById(TaskProcessRecord taskProcessRecord); + + + int deleteTaskProcessRecordById(@Param("id") Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/entity/ResultTask.java b/src/main/java/com/lz/modules/performance/entity/ResultTask.java new file mode 100644 index 00000000..187bb3f8 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/entity/ResultTask.java @@ -0,0 +1,160 @@ +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_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 { + + + + ResultTask selectResultTaskById(Long id); + + + Long insertResultTask(ResultTask resultTask); + + + int updateResultTaskById(ResultTask resultTask); + + + int updateCoverResultTaskById(ResultTask resultTask); + + + int deleteResultTaskById(Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java new file mode 100644 index 00000000..ca038ee7 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java @@ -0,0 +1,33 @@ +package com.lz.modules.performance.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.performance.entity.TaskComment; + +/** +*

+* 任务评论表 服务类 +*

+* +* @author quyixiao +* @since 2020-12-08 +*/ +public interface TaskCommentService extends IService { + + + + TaskComment selectTaskCommentById(Long id); + + + Long insertTaskComment(TaskComment taskComment); + + + int updateTaskCommentById(TaskComment taskComment); + + + int updateCoverTaskCommentById(TaskComment taskComment); + + + int deleteTaskCommentById(Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java new file mode 100644 index 00000000..bb899ec7 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java @@ -0,0 +1,33 @@ +package com.lz.modules.performance.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.performance.entity.TaskProcessRecord; + +/** +*

+* 任务进度更新表 服务类 +*

+* +* @author quyixiao +* @since 2020-12-08 +*/ +public interface TaskProcessRecordService extends IService { + + + + TaskProcessRecord selectTaskProcessRecordById(Long id); + + + Long insertTaskProcessRecord(TaskProcessRecord taskProcessRecord); + + + int updateTaskProcessRecordById(TaskProcessRecord taskProcessRecord); + + + int updateCoverTaskProcessRecordById(TaskProcessRecord taskProcessRecord); + + + int deleteTaskProcessRecordById(Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java new file mode 100644 index 00000000..b17f825e --- /dev/null +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -0,0 +1,63 @@ +package com.lz.modules.performance.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.performance.dao.ResultTaskMapper; +import com.lz.modules.performance.entity.ResultTask; +import com.lz.modules.performance.service.ResultTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 任务表 服务类 +*

+* +* @author quyixiao +* @since 2020-12-08 +*/ + +@Service +public class ResultTaskServiceImpl extends ServiceImpl implements ResultTaskService { + + + @Autowired + private ResultTaskMapper resultTaskMapper; + + + + @Override + public ResultTask selectResultTaskById(Long id){ + return resultTaskMapper.selectResultTaskById(id); + } + + + + @Override + public Long insertResultTask(ResultTask resultTask){ + return resultTaskMapper.insertResultTask(resultTask); + } + + + + @Override + public int updateResultTaskById(ResultTask resultTask){ + return resultTaskMapper.updateResultTaskById(resultTask); + } + + + + @Override + public int updateCoverResultTaskById(ResultTask resultTask){ + return resultTaskMapper.updateCoverResultTaskById(resultTask); + } + + + + @Override + public int deleteResultTaskById(Long id){ + return resultTaskMapper.deleteResultTaskById(id); + } + + + +} diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java new file mode 100644 index 00000000..8ac3ed68 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java @@ -0,0 +1,63 @@ +package com.lz.modules.performance.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.performance.dao.TaskCommentMapper; +import com.lz.modules.performance.entity.TaskComment; +import com.lz.modules.performance.service.TaskCommentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 任务评论表 服务类 +*

+* +* @author quyixiao +* @since 2020-12-08 +*/ + +@Service +public class TaskCommentServiceImpl extends ServiceImpl implements TaskCommentService { + + + @Autowired + private TaskCommentMapper taskCommentMapper; + + + + @Override + public TaskComment selectTaskCommentById(Long id){ + return taskCommentMapper.selectTaskCommentById(id); + } + + + + @Override + public Long insertTaskComment(TaskComment taskComment){ + return taskCommentMapper.insertTaskComment(taskComment); + } + + + + @Override + public int updateTaskCommentById(TaskComment taskComment){ + return taskCommentMapper.updateTaskCommentById(taskComment); + } + + + + @Override + public int updateCoverTaskCommentById(TaskComment taskComment){ + return taskCommentMapper.updateCoverTaskCommentById(taskComment); + } + + + + @Override + public int deleteTaskCommentById(Long id){ + return taskCommentMapper.deleteTaskCommentById(id); + } + + + +} diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java new file mode 100644 index 00000000..c13533bd --- /dev/null +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -0,0 +1,63 @@ +package com.lz.modules.performance.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.performance.dao.TaskProcessRecordMapper; +import com.lz.modules.performance.entity.TaskProcessRecord; +import com.lz.modules.performance.service.TaskProcessRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 任务进度更新表 服务类 +*

+* +* @author quyixiao +* @since 2020-12-08 +*/ + +@Service +public class TaskProcessRecordServiceImpl extends ServiceImpl implements TaskProcessRecordService { + + + @Autowired + private TaskProcessRecordMapper taskProcessRecordMapper; + + + + @Override + public TaskProcessRecord selectTaskProcessRecordById(Long id){ + return taskProcessRecordMapper.selectTaskProcessRecordById(id); + } + + + + @Override + public Long insertTaskProcessRecord(TaskProcessRecord taskProcessRecord){ + return taskProcessRecordMapper.insertTaskProcessRecord(taskProcessRecord); + } + + + + @Override + public int updateTaskProcessRecordById(TaskProcessRecord taskProcessRecord){ + return taskProcessRecordMapper.updateTaskProcessRecordById(taskProcessRecord); + } + + + + @Override + public int updateCoverTaskProcessRecordById(TaskProcessRecord taskProcessRecord){ + return taskProcessRecordMapper.updateCoverTaskProcessRecordById(taskProcessRecord); + } + + + + @Override + public int deleteTaskProcessRecordById(Long id){ + return taskProcessRecordMapper.deleteTaskProcessRecordById(id); + } + + + +} diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml new file mode 100644 index 00000000..47d17b0f --- /dev/null +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, detail_id AS detailId, process_rate AS processRate + + + + + + + + + + insert into lz_result_task( + name, + detail_id, + process_rate, + is_delete, + gmt_create, + gmt_modified + )values( + #{ name}, + #{ detailId}, + #{ processRate}, + 0, + now(), + now() + ) + + + + + update + lz_result_task + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name}, + detail_id = #{detailId}, + process_rate = #{processRate} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_result_task + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name}, + detail_id = #{detailId}, + process_rate = #{processRate} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_result_task set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/main/resources/mapper/performance/TaskCommentMapper.xml b/src/main/resources/mapper/performance/TaskCommentMapper.xml new file mode 100644 index 00000000..79d0a221 --- /dev/null +++ b/src/main/resources/mapper/performance/TaskCommentMapper.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, task_id AS taskId, type AS type, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, content AS content, staff_name AS staffName + + + + + + + + + + insert into lz_task_comment( + task_id, + type, + detail_id, + result_record_id, + staff_id, + content, + staff_name, + is_delete, + gmt_create, + gmt_modified + )values( + #{ taskId}, + #{ type}, + #{ detailId}, + #{ resultRecordId}, + #{ staffId}, + #{ content}, + #{ staffName}, + 0, + now(), + now() + ) + + + + + update + lz_task_comment + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + task_id = #{taskId}, + type = #{type}, + detail_id = #{detailId}, + result_record_id = #{resultRecordId}, + staff_id = #{staffId}, + content = #{content}, + staff_name = #{staffName} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_task_comment + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + task_id = #{taskId}, + type = #{type}, + detail_id = #{detailId}, + result_record_id = #{resultRecordId}, + staff_id = #{staffId}, + content = #{content}, + staff_name = #{staffName} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_task_comment set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml new file mode 100644 index 00000000..cf4420c1 --- /dev/null +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, process_rate AS processRate, remark AS remark, label AS label, type AS type + + + + + + + + + + insert into lz_task_process_record( + process_rate, + remark, + label, + type, + is_delete, + gmt_create, + gmt_modified + )values( + #{ processRate}, + #{ remark}, + #{ label}, + #{ type}, + 0, + now(), + now() + ) + + + + + update + lz_task_process_record + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + process_rate = #{processRate}, + remark = #{remark}, + label = #{label}, + type = #{type} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_task_process_record + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + process_rate = #{processRate}, + remark = #{remark}, + label = #{label}, + type = #{type} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_task_process_record set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 00ac715c..21e4de04 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -84,8 +84,9 @@ public class MysqlMain { List list = new ArrayList(); - list.add(new TablesBean("lz_resource")); - list.add(new TablesBean("lz_print")); + list.add(new TablesBean("lz_result_task")); + list.add(new TablesBean("lz_task_process_record")); + list.add(new TablesBean("lz_task_comment")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();