From 78b009f60083aa13ada03d33a1958fc0913cfe4a Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 19 Nov 2020 12:00:32 +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

---
 src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java      | 2 ++
 .../sys/service/app/impl/ResultRecordServiceImpl.java      | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
index 625d6c41..20441aa6 100644
--- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
+++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
@@ -19,6 +19,8 @@ public enum WorkMsgTypeEnum {
     START_WORK(6, "绩效考评待办事项", "去查看", "# 绩效目标制定\n  ## @，你的绩效需要制定目标"),
     START_SCORE(7, "绩效考评待办事项", "去查看", "# 绩效结果输入\n  ## @，你的绩效需要输入结果"),
     PROCESS(8, "绩效考评待办事项", "去查看", "# @的绩效\n  ## 需您去处理"),
+    SKIP(9, "绩效跳过", "跳过", "# @的绩效\n  ## 己经跳过"),
+    TRANSFER(10, "绩效转交", "转交", "# @的绩效\n  ## 己经转交"),
     // 您的2020年10月绩效考核已经开始，请尽快制定绩效目标
     // 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认
     ;
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 10081144..bba5e352 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -930,6 +930,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             newSubmit(approvalDto,FlowRecordStatusEnums.SKIP_STATUS.getStatus());
         }
         flowChangeService.saveChange(approvalDto, flowRecord, 0);
+        dingtalkBusiness.sendWorkMSGWithAsyn(flowRecord.getRecordId(), WorkMsgTypeEnum. SKIP.getType());
         return R.ok("恭喜您，跳过成功。");
     }
 
@@ -940,6 +941,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowRecord.setApprovalStaffId(staffEntity.getId());
         flowRecord.setApprovalStaffName(staffEntity.getName());
         flowRecordService.updateFlowRecordById(flowRecord);
+        dingtalkBusiness.sendWorkMSGWithAsyn(flowRecord.getRecordId(), WorkMsgTypeEnum.TRANSFER.getType());
         return R.ok("转交成功");
     }
 
@@ -1074,13 +1076,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         return R.ok();
     }
 
+
     private R urge(ApprovalDto approvalDto) {
         ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
         if(!resultRecord.getCurrentApprovalStaffId().equals(approvalDto.getLoginUserId())){
             log.info("催办" +  resultRecord.getCurrentApprovalStaffId());
-            StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId());
-            StaffEntity toSelf = staffService.selectStaffById(resultRecord.getCurrentApprovalStaffId());
-            resultRecordService.sendWorkMSG(mySelf, toSelf, WorkMsgTypeEnum.URGING, 0L, 2);
+            dingtalkBusiness.sendWorkMSGWithAsyn(resultRecord.getId(), WorkMsgTypeEnum.URGING.getType());
         }
         return R.ok();
     }