Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

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();
     }
 

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;
 }

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;
 	}

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">