From bf6d24b6a2012d0fda3a98961421f8e9e513f1b9 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 25 Apr 2023 19:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=20=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=9A=84=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/ChainTask.ts     | 3 ++-
 src/queue/mail.queue.ts     | 2 +-
 src/service/task.service.ts | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/models/ChainTask.ts b/src/models/ChainTask.ts
index 842bffe..8fa02fa 100644
--- a/src/models/ChainTask.ts
+++ b/src/models/ChainTask.ts
@@ -112,7 +112,8 @@ export class ChainTaskClass extends BaseModule {
     await record.save()
     if (record.allEnd) {
       setImmediate(async function () {
-        let result = new TaskSvr().sendResultNotify(record)
+        let desc = `总数: ${record.tasks.length}, 成功: ${sCount}, 失败: ${errCount}`
+        let result = new TaskSvr().sendResultNotify(record, desc)
         record.notify = result
         await record.save()
       })
diff --git a/src/queue/mail.queue.ts b/src/queue/mail.queue.ts
index f887762..e214668 100644
--- a/src/queue/mail.queue.ts
+++ b/src/queue/mail.queue.ts
@@ -37,7 +37,7 @@ export class MailQueue {
     let link2 = `${process.env.WEB_BASE_URL}/pages/confirm.html?id=${task.id}`
     html = html.replace('{{link2}}', link2)
     let subject = `${task.starterName} 申请 ${task.name}`
-    let data: any = { html }
+    let data: any = { html, subject }
     Object(DEFAULT_MSG_DATA).zssign(data)
     let deferred = new Deferred()
     this.queue.push(async () => {
diff --git a/src/service/task.service.ts b/src/service/task.service.ts
index ec424de..03fb3b7 100644
--- a/src/service/task.service.ts
+++ b/src/service/task.service.ts
@@ -34,13 +34,13 @@ export class TaskSvr {
     new ExecQueue().addTaskToQueue(record)
   }
 
-  public async sendResultNotify(task: DocumentType<ChainTaskClass>) {
+  public async sendResultNotify(task: DocumentType<ChainTaskClass>, desc: string) {
     let userid = task.starter
     let timeStr = new Date(task.endTime).format('yyyy-MM-dd HH:mm:ss')
     return new WechatWorkService().beginApproval({
       userid,
       title: `${task.starterName}-${task.name}`,
-      desc: task.desc,
+      desc,
       info: timeStr,
     })
   }