From 41eb361911cec2d867c0a96ec9de042d0728762d 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 14:23:46 +0800 Subject: [PATCH 1/5] fix --- .../dao/TaskProcessRecordMapper.java | 4 ++-- .../performance/dto/TaskProcessRecordDto.java | 2 +- .../performance/req/ChangeTaskListReq.java | 4 ++-- .../impl/TaskProcessRecordServiceImpl.java | 4 +++- .../performance/TaskProcessRecordMapper.xml | 17 ++++++++++++----- 5 files changed, 20 insertions(+), 11 deletions(-) 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 13b02ae7..50fac591 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -31,13 +31,13 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordById(@Param("id") Long id); - List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId,@Param("useType") int useType); + List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId,@Param("useType") Integer useType); int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); - List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") int useType); + List selectTaskProcessRecordsByTaskIdsAndType(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") Integer useType); 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/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java index cf508106..84d88c14 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -38,6 +38,6 @@ public class TaskProcessRecordDto { @ApiModelProperty(value = "任务名称", name = "name") private String name; //1，修改名称，2修改进度 ，3名称和进度都修改 - @ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType") + @ApiModelProperty(value = "0表示记录，不传全部", name = "useType") private Integer useType; } 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 455106f5..96560e0a 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -21,6 +21,6 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="详情id（二选一）",name = "detailId") private Long detailId; - @ApiModelProperty(value="0:不包含评论，1包含评论",name = "type") - private int useType; + @ApiModelProperty(value="0:不包含评论，1评论",name = "type") + private Integer useType; } 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 8aee427d..762c0d7f 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 @@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.model.TaskModel; @@ -21,6 +22,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Consumer; @@ -97,7 +99,7 @@ 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,req.getUseType()) + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIdsAndType(page, collect,req.getUseType()) ); } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index f7b14bc7..be91df62 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -129,7 +129,11 @@ @@ -137,12 +141,16 @@ - + select gmt_create,remark,label,type from lz_task_process_record where is_delete = 0 + + and use_type = #{useType} + and task_id in #{taskId} @@ -155,6 +163,5 @@ select * from lz_task_process_record where is_delete = 0 and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} ) and use_type=#{taskModel.useType} order by id desc - From f51bf5a98b9137235653c76a96fa6e200dcfafd7 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 14:26:23 +0800 Subject: [PATCH 2/5] fix --- .../java/com/lz/modules/performance/req/ChangeTaskListReq.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 96560e0a..af00aad4 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -21,6 +21,6 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="详情id（二选一）",name = "detailId") private Long detailId; - @ApiModelProperty(value="0:不包含评论，1评论",name = "type") + @ApiModelProperty(value="0:记录 不传全部",name = "useType") private Integer useType; } From 1d66791b21d54c6894c112c0c7186dca744aa896 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 11 Dec 2020 14:30:38 +0800 Subject: [PATCH 3/5] =?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 --- .../java/com/lz/modules/app/dto/TaskCommentDto.java | 1 + .../lz/modules/app/service/StaffOccupationService.java | 1 + .../flow/service/impl/StaffRoleServiceImpl.java | 10 ++++++++++ 3 files changed, 12 insertions(+) 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 fb3ae5a8..09d5b6c2 100644 --- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -21,5 +21,6 @@ public class TaskCommentDto { private String atStaffNames; private String avatar; private String taskName; + private String position;// } diff --git a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java index 893e07f1..179634df 100644 --- a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java +++ b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java @@ -38,5 +38,6 @@ public interface StaffOccupationService extends IService List selectAll(); List selectStaffTypesByStaffIds(List staffIds); + } 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 433d2f59..167ed415 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 @@ -13,6 +13,7 @@ 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; +import com.lz.modules.app.entity.StaffOccupationEntity; import com.lz.modules.app.enums.DepartmentPMEnums; import com.lz.modules.app.enums.EvaluationGroupEnums; import com.lz.modules.app.enums.RoleEnums; @@ -21,6 +22,7 @@ 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.app.service.StaffOccupationService; import com.lz.modules.flow.dao.RecordRoleMapper; import com.lz.modules.flow.dao.StaffRoleDepartmentMapper; import com.lz.modules.flow.dao.StaffRoleMapper; @@ -123,6 +125,9 @@ public class StaffRoleServiceImpl extends ServiceImpl Date: Fri, 11 Dec 2020 14:35:57 +0800 Subject: [PATCH 4/5] fix --- .../lz/modules/performance/dto/TaskProcessRecordDto.java | 3 +++ .../service/impl/TaskProcessRecordServiceImpl.java | 6 ++++++ .../mapper/performance/TaskProcessRecordMapper.xml | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) 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 84d88c14..9a116d23 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -40,4 +40,7 @@ public class TaskProcessRecordDto { //1，修改名称，2修改进度 ，3名称和进度都修改 @ApiModelProperty(value = "0表示记录，不传全部", name = "useType") private Integer useType; + //1，修改名称，2修改进度 ，3名称和进度都修改 + @ApiModelProperty(value = "职位", name = "position") + private String position; } 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 b5f89af7..5a26601f 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 @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.entity.StaffOccupationEntity; import com.lz.modules.app.model.TaskModel; +import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.app.service.StaffService; import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.dto.ResultTaskDto; @@ -53,6 +55,8 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc()); @@ -126,6 +131,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setPosition(staffOccupationEntity.getPosition())); } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 91df1ed4..aed9a059 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -165,8 +165,6 @@ select * from lz_task_process_record where is_delete = 0 and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} ) and use_type=#{taskModel.useType} order by id desc -<<<<<<< HEAD -======= @@ -175,6 +173,5 @@ select * from lz_task_process_record where task_id=#{taskId} and is_delete = 0 and use_type=1 order by id desc limit 1 ->>>>>>> 0759c9bb2ac2d85becab14db3150110f2bf20e63 From 9920612d0dbdedd4610fb3dc042b32904048ecb6 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 14:52:35 +0800 Subject: [PATCH 5/5] fix --- .../performance/service/impl/TaskProcessRecordServiceImpl.java | 2 +- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 2 files changed, 2 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 5a26601f..10584681 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 @@ -116,7 +116,6 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc()); diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index aed9a059..481b832f 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -149,7 +149,7 @@