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 94cf0e54..35fd9b0c 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1454,4 +1454,12 @@ public class ResultRecordController extends AbstractController { return R.ok(); } + + + + + + + + } 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 88442101..430dfad5 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -10,6 +10,7 @@ import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.enums.RoleEnums; import com.lz.modules.app.model.RoleModel; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.app.resp.StaffRoleModel; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; @@ -252,4 +253,19 @@ public class StaffRoleController { return staffRoleService.delete(roleModel); } + + + + // http://localhost:8080/lz_management/user/lzstaffrole/role/delete?id=26 + @RequestMapping("/task/comment") + public R taskComment(TaskModel taskModel) { + + return staffRoleService.taskComment(taskModel); + } + + + + + + } diff --git a/src/main/java/com/lz/modules/app/model/TaskModel.java b/src/main/java/com/lz/modules/app/model/TaskModel.java new file mode 100644 index 00000000..4097980e --- /dev/null +++ b/src/main/java/com/lz/modules/app/model/TaskModel.java @@ -0,0 +1,14 @@ +package com.lz.modules.app.model; + + +import lombok.Data; + +@Data +public class TaskModel { + private int currPage = 1; + private int pageSize = 10; + private Long taskId; + private Long detailId; + private String content; + private Long staffId; +} diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java index 26bde5a1..01e8cbe7 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.app.model.RoleModel; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.sys.entity.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; @@ -76,4 +77,5 @@ public interface StaffRoleService extends IService { StaffRole selectStaffRolesByStaffIdDepartmentLevelList(Long loginUserId, List asList); + R taskComment(TaskModel roleModel); } \ No newline at end of file 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 02b35589..1a8b8fd8 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 @@ -21,6 +21,7 @@ import com.lz.modules.app.enums.EvaluationGroupEnums; import com.lz.modules.app.enums.RoleEnums; import com.lz.modules.app.enums.RoleMenuEnums; import com.lz.modules.app.model.RoleModel; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.flow.dao.RecordRoleMapper; @@ -28,8 +29,14 @@ import com.lz.modules.flow.dao.StaffRoleDepartmentMapper; import com.lz.modules.flow.dao.StaffRoleMapper; import com.lz.modules.flow.entity.*; import com.lz.modules.flow.service.*; +import com.lz.modules.performance.entity.ResultTask; +import com.lz.modules.performance.entity.TaskComment; +import com.lz.modules.performance.service.ResultTaskService; +import com.lz.modules.performance.service.TaskCommentService; import com.lz.modules.sys.entity.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; +import com.lz.modules.sys.entity.app.ResultDetail; +import com.lz.modules.sys.service.app.ResultDetailService; import com.lz.modules.sys.service.app.ResultRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -98,6 +105,15 @@ public class StaffRoleServiceImpl extends ServiceImpl