From 5a9ce5880b3213b005fb1938272324c33a8e8a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 18:19:25 +0800 Subject: [PATCH 01/11] fix --- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index f75e685a..f2057ec0 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -103,7 +103,7 @@ From 37e6d837971a3099a49f02b9cd4255605c7b994e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 18:24:03 +0800 Subject: [PATCH 02/11] fix --- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 index 135068c6..4263d81c 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -113,6 +113,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 18:31:56 +0800 Subject: [PATCH 03/11] fix --- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 index 4263d81c..135068c6 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -113,7 +113,6 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 18:39:14 +0800 Subject: [PATCH 04/11] fix --- .../lz/modules/performance/controller/ResultTaskController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index 1fbadedc..33ab6f1b 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -58,7 +58,7 @@ public class ResultTaskController { @PostMapping("/result/changeTaskList") @ApiOperation("任务变更记录") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskProcessRecordDto.class)}) - public R changeTaskList(ChangeTaskListReq req){ + public R changeTaskList(@RequestBody ChangeTaskListReq req){ PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); return R.ok().put("data",pageUtils); } From 6716964d5b2da6e0ab25c269cd869ea3eba3f1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 18:50:33 +0800 Subject: [PATCH 05/11] fxi --- .../service/impl/TaskProcessRecordServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 index 2a2ce79e..38053a81 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -84,8 +84,10 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId()); if(CollectionUtils.isNotEmpty(resultTaskDtos)){ List collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); @@ -103,9 +105,12 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ From 8be3f01815538b5a98479b40a875c02adc82694a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 11 Dec 2020 09:15:51 +0800 Subject: [PATCH 06/11] fix --- .../service/impl/TaskProcessRecordServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 index 38053a81..e2a430f7 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; +import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; @@ -114,8 +116,11 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ - dto.setAvatar(staffEntity.getAvatar()); - dto.setStaffName(staffEntity.getName()); + Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> { + dto.setAvatar(staffEntity1.getAvatar()); + dto.setStaffName(staffEntity1.getName()); + }); + } } return pageUtils; From 47aff425d0e715b25a1c903e119c56ff0a286f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 11 Dec 2020 10:02:16 +0800 Subject: [PATCH 07/11] fix --- .../performance/enums/ProcessRecordEnum.java | 19 ++++++++++++++----- .../service/impl/ResultTaskServiceImpl.java | 7 ++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java index efeaa3b3..6993f557 100644 --- a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java +++ b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java @@ -6,14 +6,23 @@ package com.lz.modules.performance.enums; * @Date: 2020/12/9 14:08 */ public enum ProcessRecordEnum { - NAME(1,"修改名称"), - PROCESS(2,"修改进度"), - ALL(3,"全部修改"), - ADD(4,"增加"), - DELETE(5,"删除"), + NAME(1,"更新了名称"), + PROCESS(2,"更新了进度"), + ALL(3,"更新了名称和进度"), + ADD(4,"增加了任务"), + DELETE(5,"删除了任务"), ; + public static ProcessRecordEnum findByType(int type){ + for(ProcessRecordEnum recordEnum:ProcessRecordEnum.values()){ + if(type == recordEnum.getType()){ + return recordEnum; + } + } + return null; + + } private int type; private String desc; 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 index 135068c6..83b9e5db 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -111,11 +111,12 @@ public class ResultTaskServiceImpl extends ServiceImpl { TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); if(taskProcessRecordDto != null){ - resultTaskDto.setStaffName(taskProcessRecordDto.getStaffName()); - resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); + ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setLabel(byType.getDesc())); if(finalStaffEntity !=null){ resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); - } + resultTaskDto.setStaffName(finalStaffEntity.getName()); + } } }); From c64f3aa0e05e916849010966e8df4c7a3fffa303 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 11 Dec 2020 10:19:06 +0800 Subject: [PATCH 08/11] =?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 --- .../app/controller/TestController.java | 3 +- .../service/impl/StaffRoleServiceImpl.java | 19 ++- .../dao/TaskProcessRecordMapper.java | 5 - .../performance/entity/TaskProcessRecord.java | 145 +++++++++++++++++- src/main/resources/2020_12_08_sql | 9 +- .../performance/TaskProcessRecordMapper.xml | 48 +++++- src/test/java/com/lz/mysql/MysqlMain.java | 3 - 7 files changed, 202 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index c9d36395..a4982452 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -318,17 +318,16 @@ public class TestController { } - // http://localhost:8080/lz_management/test/task/comment?taskId=1&content=xxx&staffId=294 @RequestMapping("/test/task/comment") public R taskComment(TaskModel taskModel) { return staffRoleService.taskComment(taskModel); } + //http://localhost:8080/lz_management/test/comment/list?detailId=4917&pageSize=2 @RequestMapping("/test/comment/list") public R commentList(TaskModel taskModel) { return staffRoleService.commentList(taskModel); } - } diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index c3eb938f..5ba615b2 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -30,8 +30,10 @@ import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.dao.TaskCommentMapper; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskComment; +import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.performance.service.TaskCommentService; +import com.lz.modules.performance.service.TaskProcessRecordService; import com.lz.modules.sys.entity.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; import com.lz.modules.sys.entity.app.ResultDetail; @@ -113,6 +115,9 @@ public class StaffRoleServiceImpl extends ServiceImpl taskCommentMapper.selectByCondition(page, taskModel) ); + List taskComments = pageUtils.getList(); List taskCommentDtoList = new ArrayList<>(); for (TaskComment taskComment : taskComments) { TaskCommentDto taskCommentDto = new TaskCommentDto(); BeanUtils.copyProperties(taskComment, taskCommentDto); - if(taskComment.getStaffId().equals(taskModel.getStaffId())){ + if (taskComment.getStaffId().equals(taskModel.getStaffId())) { taskCommentDto.setIsSelf(1); } taskCommentDtoList.add(taskCommentDto); } pageUtils.setList(taskCommentDtoList); return R.ok().put("data", pageUtils); - } + + } diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 4b149bdd..c3c3d184 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -22,20 +22,15 @@ 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); List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId); - int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); } \ 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 index 195edefc..20390352 100644 --- a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java +++ b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java @@ -5,14 +5,12 @@ 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-09 +* @since 2020-12-11 */ @Data @@ -40,8 +38,8 @@ public class TaskProcessRecord implements java.io.Serializable { //操作标签 @ApiModelProperty(value = "操作标签", name = "label") private String label; - //1，修改名称，2修改进度 ，3名称和进度都修改 - @ApiModelProperty(value = "1，修改名称，2修改进度 ，3名称和进度都修改", name = "type") + //1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除 + @ApiModelProperty(value = "1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除", name = "type") private Integer type; //任务 result_task得id @ApiModelProperty(value = "任务 result_task得id ", name = "taskId") @@ -49,6 +47,27 @@ public class TaskProcessRecord implements java.io.Serializable { //任务名称 @ApiModelProperty(value = "任务名称", name = "name") private String name; + //0表示记录，1 表示评论 + @ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType") + private Integer useType; + //@人员id + @ApiModelProperty(value = "@人员id", name = "atStaffId") + private Long atStaffId; + //@人员名称 + @ApiModelProperty(value = "@人员名称", name = "atStaffName") + private String atStaffName; + //lz_result_record表id + @ApiModelProperty(value = "lz_result_record表id", name = "detailId") + private Long detailId; + //lz_detail表id + @ApiModelProperty(value = "lz_detail表id", name = "resultRecordId") + private Long resultRecordId; + //员工id + @ApiModelProperty(value = "员工id", name = "staffId") + private Long staffId; + //员工名称 + @ApiModelProperty(value = "员工名称", name = "staffName") + private String staffName; /** * * @return @@ -155,14 +174,14 @@ public class TaskProcessRecord implements java.io.Serializable { } /** - * 1，修改名称，2修改进度 ，3名称和进度都修改 + * 1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除 * @return */ public Integer getType() { return type; } /** - * 1，修改名称，2修改进度 ，3名称和进度都修改 + * 1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除 * @param type */ public void setType(Integer type) { @@ -199,6 +218,111 @@ public class TaskProcessRecord implements java.io.Serializable { this.name = name; } + /** + * 0表示记录，1 表示评论 + * @return + */ + public Integer getUseType() { + return useType; + } + /** + * 0表示记录，1 表示评论 + * @param useType + */ + public void setUseType(Integer useType) { + this.useType = useType; + } + + /** + * @人员id + * @return + */ + public Long getAtStaffId() { + return atStaffId; + } + /** + * @人员id + * @param atStaffId + */ + public void setAtStaffId(Long atStaffId) { + this.atStaffId = atStaffId; + } + + /** + * @人员名称 + * @return + */ + public String getAtStaffName() { + return atStaffName; + } + /** + * @人员名称 + * @param atStaffName + */ + public void setAtStaffName(String atStaffName) { + this.atStaffName = atStaffName; + } + + /** + * lz_result_record表id + * @return + */ + public Long getDetailId() { + return detailId; + } + /** + * lz_result_record表id + * @param detailId + */ + public void setDetailId(Long detailId) { + this.detailId = detailId; + } + + /** + * lz_detail表id + * @return + */ + public Long getResultRecordId() { + return resultRecordId; + } + /** + * lz_detail表id + * @param resultRecordId + */ + public void setResultRecordId(Long resultRecordId) { + this.resultRecordId = resultRecordId; + } + + /** + * 员工id + * @return + */ + public Long getStaffId() { + return staffId; + } + /** + * 员工id + * @param staffId + */ + public void setStaffId(Long staffId) { + this.staffId = staffId; + } + + /** + * 员工名称 + * @return + */ + public String getStaffName() { + return staffName; + } + /** + * 员工名称 + * @param staffName + */ + public void setStaffName(String staffName) { + this.staffName = staffName; + } + @Override public String toString() { return "TaskProcessRecord{" + @@ -212,6 +336,13 @@ public class TaskProcessRecord implements java.io.Serializable { ",type=" + type + ",taskId=" + taskId + ",name=" + name + + ",useType=" + useType + + ",atStaffId=" + atStaffId + + ",atStaffName=" + atStaffName + + ",detailId=" + detailId + + ",resultRecordId=" + resultRecordId + + ",staffId=" + staffId + + ",staffName=" + staffName + "}"; } } \ No newline at end of file diff --git a/src/main/resources/2020_12_08_sql b/src/main/resources/2020_12_08_sql index 4c6b54c5..48d923e0 100644 --- a/src/main/resources/2020_12_08_sql +++ b/src/main/resources/2020_12_08_sql @@ -44,4 +44,11 @@ ALTER TABLE `lz_management`.`lz_task_comment` ADD COLUMN `task_id` int(11) DEFAU -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 +ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `detail_id` int(11) COMMENT 'lz_result_record表id' AFTER `at_staff_name`, ADD COLUMN `result_record_id` int(11) COMMENT 'lz_detail表id' AFTER `detail_id`; + + +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`; + + + +ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `staff_id` int(11) COMMENT '员工id' AFTER `result_record_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '员工名称' AFTER `staff_id`; \ No newline at end of file diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 85b3fe8f..99dc1195 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -2,7 +2,6 @@ - @@ -14,21 +13,29 @@ + + + + + + + - 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, task_id AS taskId, name AS name + 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, task_id AS taskId, name AS name, use_type AS useType, at_staff_id AS atStaffId, at_staff_name AS atStaffName, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, staff_name AS staffName + insert into lz_task_process_record( process_rate, @@ -37,6 +44,13 @@ type, task_id, name, + use_type, + at_staff_id, + at_staff_name, + detail_id, + result_record_id, + staff_id, + staff_name, is_delete, gmt_create, gmt_modified @@ -47,6 +61,13 @@ #{ type}, #{ taskId}, #{ name}, + #{ useType}, + #{ atStaffId}, + #{ atStaffName}, + #{ detailId}, + #{ resultRecordId}, + #{ staffId}, + #{ staffName}, 0, now(), now() @@ -65,7 +86,14 @@ label = #{label}, type = #{type}, task_id = #{taskId}, - name = #{name} + name = #{name}, + use_type = #{useType}, + at_staff_id = #{atStaffId}, + at_staff_name = #{atStaffName}, + detail_id = #{detailId}, + result_record_id = #{resultRecordId}, + staff_id = #{staffId}, + staff_name = #{staffName} ,gmt_modified = now() where id = #{id} @@ -83,17 +111,23 @@ label = #{label}, type = #{type}, task_id = #{taskId}, - name = #{name} + name = #{name}, + use_type = #{useType}, + at_staff_id = #{atStaffId}, + at_staff_name = #{atStaffName}, + detail_id = #{detailId}, + result_record_id = #{resultRecordId}, + staff_id = #{staffId}, + staff_name = #{staffName} ,gmt_modified = now() where id = #{id} - update lz_task_process_record set is_delete = 1 where id=#{id} limit 1 + 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 fc96ded1..ff99a668 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -84,9 +84,6 @@ public class MysqlMain { List list = new ArrayList(); - - list.add(new TablesBean("lz_result_task")); - list.add(new TablesBean("lz_task_process_record")); From 3a192b8fb89123819753fc0f751733e2b25752df Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 11 Dec 2020 10:37:31 +0800 Subject: [PATCH 09/11] =?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 --- .../app/controller/StaffRoleController.java | 3 +- .../app/controller/TestController.java | 2 +- .../lz/modules/app/dto/TaskCommentDto.java | 15 +++++- .../com/lz/modules/app/model/TaskModel.java | 2 + .../service/impl/StaffRoleServiceImpl.java | 49 ++++++++++--------- .../dao/TaskProcessRecordMapper.java | 2 + .../performance/entity/TaskProcessRecord.java | 2 + .../service/TaskProcessRecordService.java | 4 ++ .../impl/TaskProcessRecordServiceImpl.java | 8 +++ src/main/resources/2020_12_08_sql | 1 + .../performance/TaskProcessRecordMapper.xml | 6 +++ 11 files changed, 69 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 7815c27a..0149f48f 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -257,7 +257,7 @@ public class StaffRoleController extends AbstractController { - // http://localhost:8080/lz_management/user/lzstaffrole/task/comment?taskId=1&content=xxx&staffId=294 + // http://localhost:8080/lz_management/user/lzstaffrole/task/comment?taskId=1&content=xxx&staffId=294&atStaffId=314 @RequestMapping("/task/comment") public R taskComment(TaskModel taskModel) { if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){ @@ -266,6 +266,7 @@ public class StaffRoleController extends AbstractController { return staffRoleService.taskComment(taskModel); } + //http://localhost:8080/lz_management/user/lzstaffrole/comment/list?detailId=4917&pageSize=2 @RequestMapping("/comment/list") public R commentList(TaskModel taskModel) { diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index a4982452..67d39b9e 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -318,7 +318,7 @@ public class TestController { } - // http://localhost:8080/lz_management/test/task/comment?taskId=1&content=xxx&staffId=294 + // http://localhost:8080/lz_management/test/task/comment?taskId=1&content=xxx&staffId=294&atStaffId=314 @RequestMapping("/test/task/comment") public R taskComment(TaskModel taskModel) { return staffRoleService.taskComment(taskModel); diff --git a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java index f82b962a..9b4fb726 100644 --- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -1,9 +1,22 @@ package com.lz.modules.app.dto; import com.lz.modules.performance.entity.TaskComment; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data -public class TaskCommentDto extends TaskComment { +public class TaskCommentDto { private int isSelf; + private Date gmtCreate; + private Integer type; + private Long taskId; + private Long detailId; + private Long resultRecordId; + private Long staffId; + private String label; + private String staffName; + private Long atStaffId; + private String atStaffName; } diff --git a/src/main/java/com/lz/modules/app/model/TaskModel.java b/src/main/java/com/lz/modules/app/model/TaskModel.java index 4097980e..87bd372c 100644 --- a/src/main/java/com/lz/modules/app/model/TaskModel.java +++ b/src/main/java/com/lz/modules/app/model/TaskModel.java @@ -11,4 +11,6 @@ public class TaskModel { private Long detailId; private String content; private Long staffId; + private int useType; + private Long atStaffId; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index 5ba615b2..417e81ae 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -627,43 +627,49 @@ public class StaffRoleServiceImpl extends ServiceImpl taskCommentMapper.selectByCondition(page, taskModel) + page -> taskProcessRecordService.selectByCondition(page, taskModel) ); - - List taskComments = pageUtils.getList(); + List pageUtilsList = pageUtils.getList(); List taskCommentDtoList = new ArrayList<>(); - for (TaskComment taskComment : taskComments) { + for (TaskProcessRecord taskProcessRecord : pageUtilsList) { TaskCommentDto taskCommentDto = new TaskCommentDto(); - BeanUtils.copyProperties(taskComment, taskCommentDto); - if (taskComment.getStaffId().equals(taskModel.getStaffId())) { + BeanUtils.copyProperties(taskProcessRecord, taskCommentDto); + if (taskProcessRecord.getStaffId().equals(taskModel.getStaffId())) { taskCommentDto.setIsSelf(1); } taskCommentDtoList.add(taskCommentDto); @@ -672,5 +678,4 @@ public class StaffRoleServiceImpl extends ServiceImpl { List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds); + List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); } \ 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 index 20390352..f4ab3657 100644 --- a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java +++ b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java @@ -5,6 +5,8 @@ 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; /** *

diff --git a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java index 6b5b482a..d2d9c1e0 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java @@ -1,7 +1,9 @@ package com.lz.modules.performance.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.req.ChangeTaskListReq; @@ -37,4 +39,6 @@ public interface TaskProcessRecordService extends IService { int deleteTaskProcessRecordsByTaskId(Long taskId); + + List selectByCondition(IPage page, TaskModel taskModel); } \ No newline at end of file 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 index e2a430f7..48a09143 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -1,8 +1,10 @@ package com.lz.modules.performance.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.app.service.StaffService; import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.dto.ResultTaskDto; @@ -17,6 +19,7 @@ import com.lz.modules.sys.service.app.ResultDetailService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import sun.jvm.hotspot.oops.TypeArrayKlass; import java.util.List; import java.util.Optional; @@ -130,4 +133,9 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl selectByCondition(IPage page, TaskModel taskModel) { + return taskProcessRecordMapper.selectByCondition(page,taskModel); + } } diff --git a/src/main/resources/2020_12_08_sql b/src/main/resources/2020_12_08_sql index 48d923e0..c3b6f7c3 100644 --- a/src/main/resources/2020_12_08_sql +++ b/src/main/resources/2020_12_08_sql @@ -50,5 +50,6 @@ ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `detail_id` int( 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`; +ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `type` `type` int(11) DEFAULT 3 COMMENT 'user_type为0时：1，修改名称，2修改进度 ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论'; ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `staff_id` int(11) COMMENT '员工id' AFTER `result_record_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '员工名称' AFTER `staff_id`; \ No newline at end of file diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index fbecc074..920320d0 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -151,5 +151,11 @@ order by gmt_create desc + + + + From e1682b6c37080c3fddd15a4b04c408ec25c1cd93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 11 Dec 2020 10:46:14 +0800 Subject: [PATCH 10/11] fix --- .../performance/controller/ResultTaskController.java | 2 +- .../modules/performance/dao/TaskProcessRecordMapper.java | 4 ++-- .../java/com/lz/modules/performance/dto/ResultTaskDto.java | 7 +++++-- .../lz/modules/performance/dto/TaskProcessRecordDto.java | 3 +++ .../lz/modules/performance/entity/TaskProcessRecord.java | 2 ++ .../com/lz/modules/performance/req/ChangeTaskListReq.java | 3 +++ .../performance/service/impl/ResultTaskServiceImpl.java | 3 ++- .../service/impl/TaskProcessRecordServiceImpl.java | 4 ++-- .../mapper/performance/TaskProcessRecordMapper.xml | 7 +++---- 9 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index 33ab6f1b..fe99d0fb 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -44,7 +44,7 @@ public class ResultTaskController { @PostMapping("/result/changeTask") - @ApiOperation("任务修改") + @ApiOperation("任务新增或修改") @ApiResponses({@ApiResponse(code = 200,message = "成功")}) public R changeTask(@RequestBody ResultUpdateTaskReq req){ int i = resultTaskService.saveOrUpdateResultTask(req); diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index a1b969fb..8203f6dd 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -30,12 +30,12 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordById(@Param("id") Long id); - List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId); + List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId,@Param("useType") int useType); int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); - List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds); + List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") int useType); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java index a27cf643..ef88ac54 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -35,7 +35,10 @@ public class ResultTaskDto { //姓名 @ApiModelProperty(value = "姓名", name = "staffName") private String staffName; - //标签 + /* //标签 @ApiModelProperty(value = "标签", name = "label") - private String label; + private String label;*/ + //标签 + @ApiModelProperty(value = "类型", name = "描述") + private String typeDesc; } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java index caa598b3..22b05175 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -31,4 +31,7 @@ public class TaskProcessRecordDto { @ApiModelProperty(value = "头像", name = "avatar") private String avatar; + //标签 + @ApiModelProperty(value = "类型", name = "描述") + private String typeDesc; } diff --git a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java index 20390352..f4ab3657 100644 --- a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java +++ b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java @@ -5,6 +5,8 @@ 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; /** *

diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java index 8a50ea22..455106f5 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -20,4 +20,7 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="详情id（二选一）",name = "detailId") private Long detailId; + + @ApiModelProperty(value="0:不包含评论，1包含评论",name = "type") + private int useType; } 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 index 83b9e5db..38eb67af 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -111,8 +111,9 @@ public class ResultTaskServiceImpl extends ServiceImpl { TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); if(taskProcessRecordDto != null){ + //resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); - Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setLabel(byType.getDesc())); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc())); if(finalStaffEntity !=null){ resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); resultTaskDto.setStaffName(finalStaffEntity.getName()); 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 index e2a430f7..46b73fbc 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -94,14 +94,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( - page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect) + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect,req.getUseType()) ); } } else { pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( - page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId(),req.getUseType()) ); } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index fbecc074..3028dc51 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -129,7 +129,7 @@ @@ -142,9 +142,8 @@