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 0149f48f..2357fa80 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&atStaffId=314 + // http://localhost:8080/lz_management/user/lzstaffrole/task/comment?taskId=1&content=xxx&staffId=294&atStaffIds=314,320 @RequestMapping("/task/comment") public R taskComment(TaskModel taskModel) { if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){ 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 67d39b9e..18083c1f 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&atStaffId=314 + // http://localhost:8080/lz_management/test/task/comment?taskId=1&content=xxx&staffId=294&atStaffIds=314,320 @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 9b4fb726..fb3ae5a8 100644 --- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -17,6 +17,9 @@ public class TaskCommentDto { private Long staffId; private String label; private String staffName; - private Long atStaffId; - private String atStaffName; + private String atStaffIds; + private String atStaffNames; + private String avatar; + private String taskName; + } 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 87bd372c..1b9afe77 100644 --- a/src/main/java/com/lz/modules/app/model/TaskModel.java +++ b/src/main/java/com/lz/modules/app/model/TaskModel.java @@ -12,5 +12,5 @@ public class TaskModel { private String content; private Long staffId; private int useType; - private Long atStaffId; + private String atStaffIds; } 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 fb556883..efd48204 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 @@ -29,7 +29,6 @@ import com.lz.modules.flow.service.*; 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; @@ -647,11 +646,17 @@ public class StaffRoleServiceImpl extends ServiceImpl - - + + @@ -25,7 +25,7 @@ - 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 + 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_ids AS atStaffIds, at_staff_names AS atStaffNames, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, staff_name AS staffName @@ -45,8 +45,8 @@ task_id, name, use_type, - at_staff_id, - at_staff_name, + at_staff_ids, + at_staff_names, detail_id, result_record_id, staff_id, @@ -62,8 +62,8 @@ #{ taskId}, #{ name}, #{ useType}, - #{ atStaffId}, - #{ atStaffName}, + #{ atStaffIds}, + #{ atStaffNames}, #{ detailId}, #{ resultRecordId}, #{ staffId}, @@ -88,8 +88,8 @@ task_id = #{taskId}, name = #{name}, use_type = #{useType}, - at_staff_id = #{atStaffId}, - at_staff_name = #{atStaffName}, + at_staff_ids = #{atStaffIds}, + at_staff_names = #{atStaffNames}, detail_id = #{detailId}, result_record_id = #{resultRecordId}, staff_id = #{staffId}, @@ -113,8 +113,8 @@ task_id = #{taskId}, name = #{name}, use_type = #{useType}, - at_staff_id = #{atStaffId}, - at_staff_name = #{atStaffName}, + at_staff_ids = #{atStaffIds}, + at_staff_names = #{atStaffNames}, detail_id = #{detailId}, result_record_id = #{resultRecordId}, staff_id = #{staffId}, @@ -128,6 +128,8 @@ update lz_task_process_record set is_delete = 1 where id=#{id} limit 1 + +