|
@@ -539,7 +539,7 @@ module.exports = app => {
|
|
|
const records = [];
|
|
|
const auditors = await this.getAuditorsWithOwner(cpId, times);
|
|
|
auditors.forEach(audit => {
|
|
|
- records.push({ pid, type: pushType.changeProject, uid: audit.aid, status: auditConst.status.checked, content: noticeContent });
|
|
|
+ records.push({ pid, tid: selfAudit.tid, type: pushType.changeProject, uid: audit.aid, status: auditConst.status.checked, content: noticeContent });
|
|
|
});
|
|
|
await transaction.insert('zh_notice', records);
|
|
|
if (audits.length === 1 || selfAudit.audit_type !== auditType.key.and) {
|
|
@@ -669,9 +669,9 @@ module.exports = app => {
|
|
|
await this.ctx.service.noticeAgain.stopNoticeAgain(transaction, this.tableName, this._.map(updateData, 'id'));
|
|
|
// 添加到消息推送表
|
|
|
const noticeContent = await this.getNoticeContent(pid, selfAudit.tid, cpId, selfAudit.aid, checkData.opinion);
|
|
|
- const records = [{ pid, type: pushType.changeProject, uid: this.ctx.change.uid, status: auditConst.status.back, content: noticeContent }];
|
|
|
+ const records = [{ pid, tid: selfAudit.tid, type: pushType.changeProject, uid: this.ctx.change.uid, status: auditConst.status.back, content: noticeContent }];
|
|
|
auditors.forEach(audit => {
|
|
|
- records.push({ pid, type: pushType.changeProject, uid: audit.aid, status: auditConst.status.back, content: noticeContent });
|
|
|
+ records.push({ pid, tid: selfAudit.tid, type: pushType.changeProject, uid: audit.aid, status: auditConst.status.back, content: noticeContent });
|
|
|
});
|
|
|
await transaction.insert(this.ctx.service.noticePush.tableName, records);
|
|
|
// 同步期信息
|
|
@@ -737,9 +737,9 @@ module.exports = app => {
|
|
|
// 获取推送必要信息
|
|
|
const noticeContent = await this.getNoticeContent(pid, selfAudit.tid, cpId, selfAudit.aid, checkData.opinion);
|
|
|
// 添加推送
|
|
|
- const records = [{ pid, type: pushType.changeProject, uid: this.ctx.change.uid, status: auditConst.status.checkNo, content: noticeContent }];
|
|
|
+ const records = [{ pid, tid: selfAudit.tid, type: pushType.changeProject, uid: this.ctx.change.uid, status: auditConst.status.checkNo, content: noticeContent }];
|
|
|
auditors.forEach(audit => {
|
|
|
- records.push({ pid, type: pushType.changeProject, uid: audit.aid, status: auditConst.status.checkNo, content: noticeContent });
|
|
|
+ records.push({ pid, tid: selfAudit.tid, type: pushType.changeProject, uid: audit.aid, status: auditConst.status.checkNo, content: noticeContent });
|
|
|
});
|
|
|
await transaction.insert('zh_notice', records);
|
|
|
// 本期结束
|
|
@@ -1092,10 +1092,11 @@ module.exports = app => {
|
|
|
// const auditors = await this.db.query(sql, sqlParam);
|
|
|
// 添加到消息推送表
|
|
|
const noticeContent = await this.getNoticeContent(pid, change.tid, change.id, this.ctx.session.sessionUser.accountId, '发起修订');
|
|
|
- const records = [{ pid, type: pushType.changeProject, uid: change.uid, status: auditConst.status.revise, content: noticeContent }];
|
|
|
+ const records = [{ pid, tid: change.tid, type: pushType.changeProject, uid: change.uid, status: auditConst.status.revise, content: noticeContent }];
|
|
|
auditors.forEach(auditor => {
|
|
|
records.push({
|
|
|
pid,
|
|
|
+ tid: change.tid,
|
|
|
type: pushType.changeProject,
|
|
|
uid: auditor.aid,
|
|
|
status: auditConst.status.revise,
|
|
@@ -1159,10 +1160,11 @@ module.exports = app => {
|
|
|
const auditors = await this.getUniqAuditor(change.id, change.times - 1); // 全部参与的审批人
|
|
|
// 添加到消息推送表
|
|
|
const noticeContent = await this.getNoticeContent(pid, change.tid, change.id, this.ctx.session.sessionUser.accountId, '撤销修订');
|
|
|
- const records = [{ pid, type: pushType.changeProject, uid: change.uid, status: auditConst.status.cancelRevise, content: noticeContent }];
|
|
|
+ const records = [{ pid, tid: change.tid, type: pushType.changeProject, uid: change.uid, status: auditConst.status.cancelRevise, content: noticeContent }];
|
|
|
auditors.forEach(auditor => {
|
|
|
records.push({
|
|
|
pid,
|
|
|
+ tid: change.tid,
|
|
|
type: pushType.changeProject,
|
|
|
uid: auditor.aid,
|
|
|
status: auditConst.status.cancelRevise,
|