From baed7fe4366ee70d8567e1de36da0673d118fb06 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:35:57 +0800 Subject: [PATCH 01/18] 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 02/18] 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 @@ - select gmt_create,remark,label,type,name,use_type from lz_task_process_record where task_id=#{taskId} + select gmt_create,remark,label,type,name,use_type,detail_id from lz_task_process_record where task_id=#{taskId} and use_type = #{useType} @@ -149,7 +149,7 @@ select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0 + + From cb000f0ace295ea59748c2891be5514f7dd04245 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 15:43:12 +0800 Subject: [PATCH 06/18] fix --- .../com/lz/modules/performance/req/ResultUpdateTaskReq.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java b/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java index df5cb889..ca0da54d 100644 --- a/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java @@ -25,8 +25,8 @@ public class ResultUpdateTaskReq { @ApiModelProperty(value = "任务的当前进度", name = "processRate") private BigDecimal processRate; //更新说明 - @ApiModelProperty(value = "更新说明", name = "remake") - private String remake; + @ApiModelProperty(value = "更新说明", name = "remark") + private String remark; //排序由小到大 @ApiModelProperty(value = "排序由小到大", name = "orderBy") private Integer orderBy; From fcc6f13d7657e23b15dac787636b96ebde9b71eb 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 18:19:58 +0800 Subject: [PATCH 07/18] fiox --- .../service/impl/ScheduleJobServiceImpl.java | 2 +- .../performance/enums/ProcessRecordEnum.java | 12 ++-- .../service/impl/ResultTaskServiceImpl.java | 68 ++++++++++++++----- .../impl/TaskProcessRecordServiceImpl.java | 4 +- 4 files changed, 63 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java index b4633631..6d33f1d1 100644 --- a/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -43,7 +43,7 @@ public class ScheduleJobServiceImpl extends ServiceImpl selectResultTaskDtosByDetailId(Long detailId){ return resultTaskMapper.selectResultTaskDtosByDetailId(detailId); } + } 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 9c08c8e0..92236da7 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 @@ -131,7 +131,9 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setTaskName(resultTask1.getName())); - dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc()); + if(dto.getUseType()==0){ + dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc()); + } Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> { dto.setAvatar(staffEntity1.getAvatar()); dto.setStaffName(staffEntity1.getName()); From ff3c5aeb3ae0aa9862deb25d2dc5bfc86ba34e71 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 18:25:31 +0800 Subject: [PATCH 08/18] fix --- .../performance/service/impl/ResultTaskServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 35f2d493..ac212e92 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -203,7 +203,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Fri, 11 Dec 2020 18:26:35 +0800 Subject: [PATCH 09/18] fix --- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index ac212e92..f26d4217 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -214,7 +214,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Mon, 14 Dec 2020 10:30:11 +0800 Subject: [PATCH 10/18] fix --- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 23ede4fe..d2ec9871 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -131,7 +131,7 @@