From 75912655abff858eab336c809160f4add2e05fe0 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 9 Dec 2020 18:33:01 +0800 Subject: [PATCH] =?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 | 18 +++++---- .../app/controller/TestController.java | 16 ++++++++ .../lz/modules/app/dto/TaskCommentDto.java | 8 ++++ .../flow/service/StaffRoleService.java | 2 + .../service/impl/StaffRoleServiceImpl.java | 39 ++++++++++++++++--- .../performance/dao/TaskCommentMapper.java | 7 ++++ .../mapper/performance/TaskCommentMapper.xml | 12 +++++- 7 files changed, 88 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/dto/TaskCommentDto.java 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 430dfad5..2ecc3668 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -24,6 +24,7 @@ import com.lz.modules.flow.service.RecordRoleService; import com.lz.modules.flow.service.StaffRoleDepartmentService; import com.lz.modules.flow.service.StaffRoleEvaluationGroupService; import com.lz.modules.flow.service.StaffRoleService; +import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; import io.swagger.annotations.Api; @@ -49,7 +50,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("user/lzstaffrole") @Api(tags = "考评组管理员管理") -public class StaffRoleController { +public class StaffRoleController extends AbstractController { @Autowired private StaffRoleService staffRoleService; @@ -256,16 +257,19 @@ public class StaffRoleController { - // http://localhost:8080/lz_management/user/lzstaffrole/role/delete?id=26 + // http://localhost:8080/lz_management/user/lzstaffrole/task/comment?taskId=1&content=xxx&staffId=294 @RequestMapping("/task/comment") public R taskComment(TaskModel taskModel) { - + if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){ + taskModel.setStaffId(getUserId()); + } 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) { + return staffRoleService.commentList(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 ab853483..1eccaa9d 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -15,6 +15,7 @@ import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.enums.ResultRecordStatusEnum; import com.lz.modules.app.enums.RoleEnums; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; @@ -315,4 +316,19 @@ public class TestController { return R.error(e.getMessage()); } } + + + + // 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/app/dto/TaskCommentDto.java b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java new file mode 100644 index 00000000..8c35321f --- /dev/null +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -0,0 +1,8 @@ +package com.lz.modules.app.dto; + +import com.lz.modules.performance.entity.TaskComment; +import lombok.Data; + +@Data +public class TaskCommentDto extends TaskComment { +} 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 01e8cbe7..496a59a6 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java @@ -78,4 +78,6 @@ public interface StaffRoleService extends IService { StaffRole selectStaffRolesByStaffIdDepartmentLevelList(Long loginUserId, List asList); R taskComment(TaskModel roleModel); + + R commentList(TaskModel taskModel); } \ 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 1a8b8fd8..6b6473f6 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 @@ -9,10 +9,7 @@ import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.dao.DepartmentsDao; import com.lz.modules.app.dao.StaffDao; -import com.lz.modules.app.dto.EvaluationGroupInfo; -import com.lz.modules.app.dto.StaffRoleDetailInfo; -import com.lz.modules.app.dto.StaffRoleInfo; -import com.lz.modules.app.dto.StaffRoleResp; +import com.lz.modules.app.dto.*; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; @@ -24,11 +21,14 @@ 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.equipment.entity.model.FindEmployeeResModel; import com.lz.modules.flow.dao.RecordRoleMapper; 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.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.service.ResultTaskService; @@ -43,6 +43,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import sun.jvm.hotspot.oops.TypeArrayKlass; import java.util.*; import java.util.stream.Collectors; @@ -114,6 +115,12 @@ 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); + taskCommentDtoList.add(taskCommentDto); + } + pageUtils.setList(taskCommentDtoList); + return R.ok().put("data", pageUtils); + + } } diff --git a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java index e114e577..0d7850d4 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java @@ -8,9 +8,14 @@ package com.lz.modules.performance.dao; * @since 2020-12-08 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.lz.modules.app.model.TaskModel; import com.lz.modules.performance.entity.TaskComment; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface TaskCommentMapper extends BaseMapper { @@ -31,4 +36,6 @@ public interface TaskCommentMapper extends BaseMapper { int deleteTaskCommensByTaskId(@Param("taskId") Long taskId); + + List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); } \ No newline at end of file diff --git a/src/main/resources/mapper/performance/TaskCommentMapper.xml b/src/main/resources/mapper/performance/TaskCommentMapper.xml index 2edc0255..67159b7c 100644 --- a/src/main/resources/mapper/performance/TaskCommentMapper.xml +++ b/src/main/resources/mapper/performance/TaskCommentMapper.xml @@ -1,6 +1,6 @@ - + @@ -95,11 +95,19 @@ + + + + update lz_task_comment set is_delete = 1 where id=#{id} limit 1 - + update lz_task_comment set is_delete = 1 where task_id=#{taskId}