From afc2753b05f4075210e2f3d3cd106e20f1c21526 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 11 Dec 2020 11:04:33 +0800
Subject: [PATCH 1/2] =?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

---
 .../lz/modules/flow/service/impl/StaffRoleServiceImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 417e81ae..fb556883 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
@@ -654,7 +654,12 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
         }
         taskProcessRecord.setUseType(1);
         taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
-        dingtalkBusiness.sendTaskNoticeMsg(taskProcessRecord.getDetailId(), taskProcessRecord.getTaskId());
+        try {
+            dingtalkBusiness.sendTaskNoticeMsg(taskProcessRecord.getDetailId(), taskProcessRecord.getTaskId());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+        }
         return R.ok();
     }
 

From a663ff3da280251bcb7f29ebb9bf5bab33051289 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 11:12:07 +0800
Subject: [PATCH 2/2] fix

---
 .../lz/modules/performance/dto/TaskProcessRecordDto.java    | 6 ++++++
 .../service/impl/TaskProcessRecordServiceImpl.java          | 3 +++
 .../mapper/performance/TaskProcessRecordMapper.xml          | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

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 22b05175..cf508106 100644
--- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
+++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
@@ -34,4 +34,10 @@ public class TaskProcessRecordDto {
     //标签
     @ApiModelProperty(value = "类型", name = "描述")
     private String typeDesc;
+    //操作标签
+    @ApiModelProperty(value = "任务名称", name = "name")
+    private String name;
+    //1，修改名称，2修改进度  ，3名称和进度都修改
+    @ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType")
+    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 5327af7b..8aee427d 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
@@ -11,6 +11,7 @@ import com.lz.modules.performance.dto.ResultTaskDto;
 import com.lz.modules.performance.dto.TaskProcessRecordDto;
 import com.lz.modules.performance.entity.ResultTask;
 import com.lz.modules.performance.entity.TaskProcessRecord;
+import com.lz.modules.performance.enums.ProcessRecordEnum;
 import com.lz.modules.performance.req.ChangeTaskListReq;
 import com.lz.modules.performance.service.ResultTaskService;
 import com.lz.modules.performance.service.TaskProcessRecordService;
@@ -118,12 +119,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 			StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
 			List<TaskProcessRecordDto> dtos = list;
 			for(TaskProcessRecordDto dto:dtos){
+				dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc());
 				Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> {
                     dto.setAvatar(staffEntity1.getAvatar());
                     dto.setStaffName(staffEntity1.getName());
                 });
 
 			}
+
 		}
 		return pageUtils;
 	}
diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
index 66ddb0d8..f7b14bc7 100644
--- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
+++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
@@ -129,7 +129,7 @@
     </update>
 
     <select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
-        select gmt_create,remark,label,type from lz_task_process_record  where task_id=#{taskId} and use_type = #{useType} and is_delete = 0 order by gmt_create desc
+        select gmt_create,remark,label,type,name,use_type from lz_task_process_record  where task_id=#{taskId} and use_type = #{useType} and is_delete = 0 order by gmt_create desc
     </select>
 
     <update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long">