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 + + + +