From 3279dee5a1cfca949165e75803ceb1e29e168c69 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 28 Aug 2020 11:31:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E6=94=B9=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/common/emun/WorkMsgTypeEnum.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java index bee48831..6581a5c2 100644 --- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java +++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java @@ -3,17 +3,17 @@ package com.lz.common.emun; import javax.security.auth.message.AuthStatus; /** - * 业绩通知相关type + * 绩效通知相关type */ public enum WorkMsgTypeEnum { - //业绩提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板） - SUBMIT(0, "业绩提交", "去审核", "# 业绩提交\n ## @的业绩已经提交"), - //业绩打回审核的通知 - REJECT(1, "业绩驳回", "去修改", "# 业绩驳回\n ## 你的业绩已经驳回"), - //业绩通过领导审核的通知，这一步提交到HR，提交的type - LEADER_PASS(2, "业绩已打分", "去提交给人事", "# 业绩已打分\n ## 你的业绩已经打分"), - //业绩通过人事，老板审核的最终审核通知 - PASS(3, "业绩通过", "去查看", "# 业绩通过\n ## 你的业绩已经通过"),; + //绩效提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板） + SUBMIT(0, "绩效提交", "去审核", "# 绩效提交\n ## @的绩效已经提交"), + //绩效打回审核的通知 + REJECT(1, "绩效驳回", "去修改", "# 绩效驳回\n ## 你的绩效已经驳回"), + //绩效通过领导审核的通知，这一步提交到HR，提交的type + LEADER_PASS(2, "绩效已打分", "去提交给人事", "# 绩效已打分\n ## 你的绩效已经打分"), + //绩效通过人事，老板审核的最终审核通知 + PASS(3, "绩效通过", "去查看", "# 绩效通过\n ## 你的绩效已经通过"),; int type; String title; String btnText; From 93a8e1ccaf40a36d150b9fc97bc5749666a8fbfa Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 28 Aug 2020 13:40:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=92=89=E9=92=89?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=B6=88=E6=81=AF=E9=93=BE=E6=8E=A5=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=BA=E4=BE=A7=E8=BE=B9=E6=A0=8F=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/job/business/DingtalkBusiness.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 3b613260..f4677138 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -212,8 +212,10 @@ public class DingtalkBusiness { url += "?halokit=" + System.currentTimeMillis(); } url = URLEncoder.encode(url); - url = "dingtalk://dingtalkclient/action/openapp?corpid=" + thirdAppConfig.getCorpId() + - "&container_type=work_platform&app_id=0_" + appid + "&redirect_type=jump&redirect_url=" + url; + /* url = "dingtalk://dingtalkclient/action/openapp?corpid=" + thirdAppConfig.getCorpId() + + "&container_type=work_platform&app_id=0_" + appid + "&redirect_type=jump&redirect_url=" + url;*/ + + url = "dingtalk://dingtalkclient/page/link?url=" + url; String content = workMsgTypeEnum.getContent().replace("@", fromStaffEntity.getName()); return dingTalkUtil.sendSingleActionCardMSG(appid, toStaffEntity, workMsgTypeEnum.getTitle(), From 8e85e67cd4ba331da109ad29dd81bbab8583371d Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 28 Aug 2020 14:25:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=92=89=E9=92=89?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/job/business/DingtalkBusiness.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index f4677138..c44bc14f 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -215,7 +215,7 @@ public class DingtalkBusiness { /* url = "dingtalk://dingtalkclient/action/openapp?corpid=" + thirdAppConfig.getCorpId() + "&container_type=work_platform&app_id=0_" + appid + "&redirect_type=jump&redirect_url=" + url;*/ - url = "dingtalk://dingtalkclient/page/link?url=" + url; + url = "dingtalk://dingtalkclient/page/link?pc_slide=true&url=" + url; String content = workMsgTypeEnum.getContent().replace("@", fromStaffEntity.getName()); return dingTalkUtil.sendSingleActionCardMSG(appid, toStaffEntity, workMsgTypeEnum.getTitle(),