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) { + public async sendResultNotify(task: DocumentType, 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, }) }