@steedos-labs/content-compliance-bev 0.2.4 → 0.2.6

package/lib/actions/spotCheckMaterial.js

@@ -428,7 +428,7 @@ exports.sendMonthlySpotCheckReport = {
     },
     handler: function (ctx) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var user, rid, logger, report, yearMonth, data, _a, monthStart, monthEnd, brandList, brandLeaderList, _loop_1, brandLeaderList_1, brandLeaderList_1_1, brandLeader, e_3_1;
+            var user, rid, logger, report, yearMonth, data, _a, monthStart, monthEnd, brandList, brandLeaderList, results, skipped, _loop_1, brandLeaderList_1, brandLeaderList_1_1, brandLeader, e_3_1;
             var e_3, _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -462,6 +462,8 @@ exports.sendMonthlySpotCheckReport = {
                         return [4, ctx.getObject('pepsico_brand_leader').directFind({ filters: [] })];
                     case 3:
                         brandLeaderList = _c.sent();
+                        results = [];
+                        skipped = [];
                         _loop_1 = function (brandLeader) {
                             var list, subject, brand, lid, html, toUsers, toUsersAll, error_3, ccUsers, ccUsersAll, error_4, result;
                             return tslib_1.__generator(this, function (_d) {
@@ -474,46 +476,65 @@ exports.sendMonthlySpotCheckReport = {
                                         console.log('sendMonthlySpotCheckReport find', brandLeader.name, list.length, JSON.stringify({
                                             filters: [['spot_checked_done', '=', true], ['product', '=', brandLeader.name], ['classification', '=', brandLeader.classification], ['spot_checked_done_time', '>=', monthStart], ['spot_checked_done_time', '<=', monthEnd]]
                                         }));
-                                        if (!(list.length > 0)) return [3, 13];
+                                        if (!(list.length > 0)) return [3, 14];
                                         subject = "\u3010\u7CFB\u7EDF\u901A\u77E5\u3011".concat(brandLeader.remark, "\u6708\u5EA6\u62BD\u67E5\u62A5\u544A[").concat(yearMonth, "]");
                                         brand = (0, lodash_1.find)(brandList, function (item) { return item.value === brandLeader.name; });
-                                        if (!brandLeader) return [3, 13];
-                                        return [4, ctx.getObject('pepsico_mail_send_log')._makeNewID()];
+                                        if (!!brand) return [3, 2];
+                                        skipped.push({
+                                            product: brandLeader.name,
+                                            classification: brandLeader.classification,
+                                            count: list.length,
+                                            reason: '未找到品牌映射'
+                                        });
+                                        console.log('sendMonthlySpotCheckReport skip unknown brand', brandLeader.name, brandLeader.classification);
+                                        return [3, 14];
                                     case 2:
+                                        if (!brandLeader) return [3, 14];
+                                        return [4, ctx.getObject('pepsico_mail_send_log')._makeNewID()];
+                                    case 3:
                                         lid = _d.sent();
                                         html = "\n                        <p>\u4EB2\u7231\u7684\u7528\u6237\uFF0C</p>\n                        <p>\u672C\u6708".concat(brand.label, "\u62BD\u67E5\u7D20\u6750\u62A5\u544A\u5DF2\u751F\u6210\u3002 \u8BF7\u70B9\u51FB\u4E0B\u9762\u94FE\u63A5\u67E5\u770B").concat(brand.label, "\u6708\u5EA6\u62BD\u67E5\u62A5\u544A\uFF0C\u5EFA\u8BAE\u5206\u4EAB\u7ED9\u56E2\u961F\u6210\u5458\u8FDB\u884C\u5B66\u4E60\u3002</p>\n                        <a href=\"").concat(process.env.ROOT_URL, "/api/pepsico-content/material/click/spot-report/").concat(rid, "/").concat(lid, "\">").concat(brandLeader.remark, "\uFF1A").concat(yearMonth, "</a>\n                        <p>\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u3002</p>\n                        <p>\u8C22\u8C22\uFF01</p>\n                    ");
                                         toUsers = [];
-                                        if (!brandLeader.to) return [3, 6];
-                                        _d.label = 3;
-                                    case 3:
-                                        _d.trys.push([3, 5, , 6]);
-                                        return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', brandLeader.to] })];
+                                        if (!brandLeader.to) return [3, 7];
+                                        _d.label = 4;
                                     case 4:
+                                        _d.trys.push([4, 6, , 7]);
+                                        return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', brandLeader.to] })];
+                                    case 5:
                                         toUsersAll = _d.sent();
                                         toUsers = toUsersAll.filter(function (u) { return u.email && u.email.endsWith('@pepsico.com'); });
-                                        return [3, 6];
-                                    case 5:
+                                        return [3, 7];
+                                    case 6:
                                         error_3 = _d.sent();
                                         console.log(error_3);
-                                        return [3, 6];
-                                    case 6:
-                                        ccUsers = [];
-                                        if (!brandLeader.cc) return [3, 10];
-                                        _d.label = 7;
+                                        return [3, 7];
                                     case 7:
-                                        _d.trys.push([7, 9, , 10]);
-                                        return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', brandLeader.cc] })];
+                                        ccUsers = [];
+                                        if (!brandLeader.cc) return [3, 11];
+                                        _d.label = 8;
                                     case 8:
+                                        _d.trys.push([8, 10, , 11]);
+                                        return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', brandLeader.cc] })];
+                                    case 9:
                                         ccUsersAll = _d.sent();
                                         ccUsers = ccUsersAll.filter(function (u) { return u.email && u.email.endsWith('@pepsico.com'); });
-                                        return [3, 10];
-                                    case 9:
+                                        return [3, 11];
+                                    case 10:
                                         error_4 = _d.sent();
                                         console.log(error_4);
-                                        return [3, 10];
-                                    case 10: return [4, sendEmail(process.env.B6_EMAIL_FROM, (0, lodash_1.join)((0, lodash_1.map)(toUsers, 'email'), ';'), subject, '', html, (0, lodash_1.join)((0, lodash_1.map)(ccUsers, 'email'), ';'))];
-                                    case 11:
+                                        return [3, 11];
+                                    case 11: return [4, sendEmail(process.env.B6_EMAIL_FROM, (0, lodash_1.join)((0, lodash_1.map)(toUsers, 'email'), ';'), subject, '', html, (0, lodash_1.join)((0, lodash_1.map)(ccUsers, 'email'), ';'))];
+                                    case 12:
                                         result = _d.sent();
+                                        results.push({
+                                            product: brand.value,
+                                            product_label: brand.label,
+                                            classification: brandLeader.classification,
+                                            count: list.length,
+                                            to: (0, lodash_1.map)(toUsers, 'email'),
+                                            cc: (0, lodash_1.map)(ccUsers, 'email'),
+                                            result: result
+                                        });
                                         return [4, ctx.getObject('pepsico_mail_send_log').insert({
                                                 _id: lid,
                                                 name: subject,
@@ -528,10 +549,10 @@ exports.sendMonthlySpotCheckReport = {
                                                 result: result,
                                                 space: report.space
                                             }, user)];
-                                    case 12:
+                                    case 13:
                                         _d.sent();
-                                        _d.label = 13;
-                                    case 13: return [2];
+                                        _d.label = 14;
+                                    case 14: return [2];
                                 }
                             });
                         };
@@ -567,7 +588,18 @@ exports.sendMonthlySpotCheckReport = {
                         })];
                     case 12:
                         _c.sent();
-                        return [2];
+                        return [2, {
+                                status: 200,
+                                msg: '月度抽查报告邮件发送完成',
+                                data: {
+                                    year_month: yearMonth,
+                                    brand_leader_count: brandLeaderList.length,
+                                    sent_count: results.length,
+                                    skipped_count: skipped.length,
+                                    results: results,
+                                    skipped: skipped
+                                }
+                            }];
                 }
             });
         });
@@ -858,7 +890,7 @@ exports.generateSpotCheckPool = {
     },
     handler: function (ctx) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var user, pid, logger, pool, yearMonth, pools, logs, departmentUserIds_2, _a, _b, material, approval, _c, _d, field, users, e_5_1, specialistUserIds_2, _e, _f, material, approval, sUsers, e_6_1, ROOT_URL, subject, midTierLink, midTierHtml, departmentToUsers, toUsersAll, error_6, midTierResult, _g, microLink, microHtml, specialistToUsers, toUsersAll, error_7, microResult, _h, departmentUserIds_1, departmentUserIds_1_1, userId, e_7_1, specialistUserIds_1, specialistUserIds_1_1, userId, e_8_1, error_8, error_9;
+            var user, pid, logger, pool, yearMonth, pools, logs, logs_1, departmentUserIds_2, _a, _b, material, approval, _c, _d, field, users, e_5_1, specialistUserIds_2, _e, _f, material, approval, sUsers, e_6_1, ROOT_URL, midTierSubject, microSubject, midTierLink, midTierHtml, departmentToUsers, toUsersAll, error_6, midTierResult, _g, microLink, microHtml, specialistToUsers, toUsersAll, error_7, microResult, _h, fromUserId, departmentUserIds_1, departmentUserIds_1_1, userId, e_7_1, specialistUserIds_1, specialistUserIds_1_1, userId, e_8_1, error_8, error_9, message, updateError_1;
             var e_5, _j, e_9, _k, e_6, _l, e_7, _m, e_8, _o;
             return tslib_1.__generator(this, function (_p) {
                 switch (_p.label) {
@@ -882,7 +914,7 @@ exports.generateSpotCheckPool = {
                         yearMonth = pool.year_month;
                         _p.label = 3;
                     case 3:
-                        _p.trys.push([3, 56, , 57]);
+                        _p.trys.push([3, 58, , 63]);
                         return [4, getSpotCheckPool(yearMonth)];
                     case 4:
                         pools = _p.sent();
@@ -893,22 +925,38 @@ exports.generateSpotCheckPool = {
                         console.log("\u603B\u62BD\u6837\u6570: ".concat(pools['Micro'].samplingPool.length), (0, lodash_1.map)(pools['Micro'].samplingPool, function (item) { return (0, lodash_1.pick)(item, ['_id', 'product']); }));
                         console.log('品牌统计:', pools['Micro'].statistics.byBrand);
                         logs = "\n            [".concat(yearMonth, "] \u627E\u5230 ").concat(pools.count, " \u4E2A\u5BA1\u6279\u5B8C\u6210\u7684\u7D20\u6750 \r\n\n            === \u8170\u90E8(Mid-tier)\u62BD\u67E5\u6C60\u5B50 === \r\n\n            \u603B\u62BD\u6837\u6570: ").concat(pools['Mid-tier'].samplingPool.length, ", ").concat(JSON.stringify((0, lodash_1.map)(pools['Mid-tier'].samplingPool, function (item) { return (0, lodash_1.pick)(item, ['_id', 'product']); })), " \r\n\n            \u54C1\u724C\u7EDF\u8BA1:, ").concat(JSON.stringify(pools['Mid-tier'].statistics.byBrand), " \r\n\n            \n=== \u5C3E\u90E8(Micro)\u62BD\u67E5\u6C60\u5B50 ===' \r\n\n            \u603B\u62BD\u6837\u6570: ").concat(pools['Micro'].samplingPool.length, ", ").concat(JSON.stringify((0, lodash_1.map)(pools['Micro'].samplingPool, function (item) { return (0, lodash_1.pick)(item, ['_id', 'product']); })), " \r\n\n            \u54C1\u724C\u7EDF\u8BA1:, ").concat(JSON.stringify(pools['Micro'].statistics.byBrand), " \r\n\n            ");
-                        if (pools.count < 1) {
-                            console.log('无可抽查素材. 不发送邮件.');
-                            return [2];
-                        }
-                        departmentUserIds_2 = new Set();
-                        _p.label = 5;
+                        if (!(pools.count < 1)) return [3, 6];
+                        logs_1 = "[".concat(yearMonth, "] \u627E\u5230 0 \u4E2A\u5BA1\u6279\u5B8C\u6210\u7684\u7D20\u6750\uFF0C\u672A\u53D1\u9001\u90AE\u4EF6\u3002");
+                        console.log('无可抽查素材. 不发送邮件.');
+                        return [4, ctx.getObject('pepsico_spot_check_pool').directUpdate(pid, {
+                                logs: logs_1
+                            })];
                     case 5:
-                        _p.trys.push([5, 11, 12, 13]);
-                        _a = tslib_1.__values(pools['Mid-tier'].samplingPool), _b = _a.next();
-                        _p.label = 6;
+                        _p.sent();
+                        return [2, {
+                                status: 200,
+                                msg: '无可抽查素材，未发送邮件',
+                                data: {
+                                    year_month: yearMonth,
+                                    count: pools.count
+                                }
+                            }];
                     case 6:
-                        if (!!_b.done) return [3, 10];
+                        departmentUserIds_2 = new Set();
+                        _p.label = 7;
+                    case 7:
+                        _p.trys.push([7, 13, 14, 15]);
+                        _a = tslib_1.__values(pools['Mid-tier'].samplingPool), _b = _a.next();
+                        _p.label = 8;
+                    case 8:
+                        if (!!_b.done) return [3, 12];
                         material = _b.value;
                         return [4, ctx.getObject('pepsico_material_approval').findOne(material.pepsico_material_approval)];
-                    case 7:
+                    case 9:
                         approval = _p.sent();
+                        if (!approval) {
+                            throw new Error("\u7D20\u6750 ".concat(material._id, " \u672A\u627E\u5230\u5173\u8054\u7684\u7D20\u6750\u5BA1\u6279\u5355"));
+                        }
                         return [4, ctx.getObject('pepsico_material').directUpdate(material._id, {
                                 spot_check_pool_year_month: yearMonth,
                                 spot_checked: true,
@@ -918,7 +966,7 @@ exports.generateSpotCheckPool = {
                                 ns_spot_check_user: approval.ns_spot_check,
                                 ca_spot_check_user: approval.ca_spot_check
                             })];
-                    case 8:
+                    case 10:
                         _p.sent();
                         try {
                             for (_c = (e_9 = void 0, tslib_1.__values(['legal_spot_check', 'sra_spot_check', 'ns_spot_check', 'ca_spot_check'])), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -936,128 +984,133 @@ exports.generateSpotCheckPool = {
                             }
                             finally { if (e_9) throw e_9.error; }
                         }
-                        _p.label = 9;
-                    case 9:
-                        _b = _a.next();
-                        return [3, 6];
-                    case 10: return [3, 13];
+                        _p.label = 11;
                     case 11:
+                        _b = _a.next();
+                        return [3, 8];
+                    case 12: return [3, 15];
+                    case 13:
                         e_5_1 = _p.sent();
                         e_5 = { error: e_5_1 };
-                        return [3, 13];
-                    case 12:
+                        return [3, 15];
+                    case 14:
                         try {
                             if (_b && !_b.done && (_j = _a.return)) _j.call(_a);
                         }
                         finally { if (e_5) throw e_5.error; }
                         return [7];
-                    case 13:
+                    case 15:
                         specialistUserIds_2 = new Set();
-                        _p.label = 14;
-                    case 14:
-                        _p.trys.push([14, 20, 21, 22]);
+                        _p.label = 16;
+                    case 16:
+                        _p.trys.push([16, 22, 23, 24]);
                         _e = tslib_1.__values(pools['Micro'].samplingPool), _f = _e.next();
-                        _p.label = 15;
-                    case 15:
-                        if (!!_f.done) return [3, 19];
+                        _p.label = 17;
+                    case 17:
+                        if (!!_f.done) return [3, 21];
                         material = _f.value;
                         return [4, ctx.getObject('pepsico_material_approval').findOne(material.pepsico_material_approval)];
-                    case 16:
+                    case 18:
                         approval = _p.sent();
+                        if (!approval) {
+                            throw new Error("\u7D20\u6750 ".concat(material._id, " \u672A\u627E\u5230\u5173\u8054\u7684\u7D20\u6750\u5BA1\u6279\u5355"));
+                        }
                         return [4, ctx.getObject('pepsico_material').directUpdate(material._id, {
                                 spot_check_pool_year_month: yearMonth,
                                 spot_checked: true,
                                 spot_check_type: '审核专员抽查',
                                 guding_spot_check_user: approval.special_spot_check || []
                             })];
-                    case 17:
+                    case 19:
                         _p.sent();
                         sUsers = approval.special_spot_check;
                         if (sUsers) {
                             (Array.isArray(sUsers) ? sUsers : [sUsers]).forEach(function (id) { return specialistUserIds_2.add(id); });
                         }
-                        _p.label = 18;
-                    case 18:
-                        _f = _e.next();
-                        return [3, 15];
-                    case 19: return [3, 22];
+                        _p.label = 20;
                     case 20:
+                        _f = _e.next();
+                        return [3, 17];
+                    case 21: return [3, 24];
+                    case 22:
                         e_6_1 = _p.sent();
                         e_6 = { error: e_6_1 };
-                        return [3, 22];
-                    case 21:
+                        return [3, 24];
+                    case 23:
                         try {
                             if (_f && !_f.done && (_l = _e.return)) _l.call(_e);
                         }
                         finally { if (e_6) throw e_6.error; }
                         return [7];
-                    case 22:
+                    case 24:
                         ROOT_URL = process.env.ROOT_URL;
-                        subject = '【系统通知】抽查素材通知';
-                        midTierLink = "".concat(ROOT_URL, "/app/pepsico_content_review/pepsico_midtier_spot_check");
+                        midTierSubject = '【系统通知】腰部素材抽查通知';
+                        microSubject = '【系统通知】尾部素材抽查通知';
+                        midTierLink = "".concat(ROOT_URL, "/app/pepsico_content_review/page/pepsico_midtier_spot_check");
                         midTierHtml = "\n                <p>\u4EB2\u7231\u7684\u7528\u6237\uFF0C</p>\n                <p>\u3010".concat(yearMonth, "\u3011\u6708\u5EA6\u62BD\u67E5\u7D20\u6750\u6C60\u5DF2\u751F\u6210\u3002\u8BF7\u70B9\u51FB\u4EE5\u4E0B\u94FE\u63A5\u8FDB\u5165\u62BD\u67E5\u9875\u9762\uFF1A</p>\n                <p><a href=\"").concat(midTierLink, "\">\u70B9\u51FB\u8FDB\u5165\u62BD\u67E5</a></p>\n                <p>\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u3002</p>\n                <p>\u8C22\u8C22\uFF01</p>\n            ");
                         departmentToUsers = [];
-                        if (!(departmentUserIds_2.size > 0)) return [3, 26];
-                        _p.label = 23;
-                    case 23:
-                        _p.trys.push([23, 25, , 26]);
+                        if (!(departmentUserIds_2.size > 0)) return [3, 28];
+                        _p.label = 25;
+                    case 25:
+                        _p.trys.push([25, 27, , 28]);
                         return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', Array.from(departmentUserIds_2)] })];
-                    case 24:
+                    case 26:
                         toUsersAll = _p.sent();
                         departmentToUsers = toUsersAll.filter(function (u) { return u.email && u.email.endsWith('@pepsico.com'); });
-                        return [3, 26];
-                    case 25:
+                        return [3, 28];
+                    case 27:
                         error_6 = _p.sent();
                         console.log(error_6);
-                        return [3, 26];
-                    case 26:
-                        if (!(departmentToUsers.length > 0)) return [3, 28];
-                        return [4, sendEmail(process.env.B6_EMAIL_FROM, (0, lodash_1.join)((0, lodash_1.map)(departmentToUsers, 'email'), ';'), subject, '', midTierHtml, '')];
-                    case 27:
-                        _g = _p.sent();
-                        return [3, 29];
+                        return [3, 28];
                     case 28:
-                        _g = '无收件人';
-                        _p.label = 29;
+                        if (!(departmentToUsers.length > 0)) return [3, 30];
+                        return [4, sendEmail(process.env.B6_EMAIL_FROM, (0, lodash_1.join)((0, lodash_1.map)(departmentToUsers, 'email'), ';'), midTierSubject, '', midTierHtml, '')];
                     case 29:
+                        _g = _p.sent();
+                        return [3, 31];
+                    case 30:
+                        _g = '无收件人';
+                        _p.label = 31;
+                    case 31:
                         midTierResult = _g;
-                        microLink = "".concat(ROOT_URL, "/app/pepsico_content_review/pepsico_spot_check");
+                        microLink = "".concat(ROOT_URL, "/app/pepsico_content_review/page/pepsico_spot_check");
                         microHtml = "\n                <p>\u4EB2\u7231\u7684\u7528\u6237\uFF0C</p>\n                <p>\u3010".concat(yearMonth, "\u3011\u6708\u5EA6\u62BD\u67E5\u7D20\u6750\u6C60\u5DF2\u751F\u6210\u3002\u8BF7\u70B9\u51FB\u4EE5\u4E0B\u94FE\u63A5\u8FDB\u5165\u62BD\u67E5\u9875\u9762\uFF1A</p>\n                <p><a href=\"").concat(microLink, "\">\u70B9\u51FB\u8FDB\u5165\u62BD\u67E5</a></p>\n                <p>\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u3002</p>\n                <p>\u8C22\u8C22\uFF01</p>\n            ");
                         specialistToUsers = [];
-                        if (!(specialistUserIds_2.size > 0)) return [3, 33];
-                        _p.label = 30;
-                    case 30:
-                        _p.trys.push([30, 32, , 33]);
+                        if (!(specialistUserIds_2.size > 0)) return [3, 35];
+                        _p.label = 32;
+                    case 32:
+                        _p.trys.push([32, 34, , 35]);
                         return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', Array.from(specialistUserIds_2)] })];
-                    case 31:
+                    case 33:
                         toUsersAll = _p.sent();
                         specialistToUsers = toUsersAll.filter(function (u) { return u.email && u.email.endsWith('@pepsico.com'); });
-                        return [3, 33];
-                    case 32:
+                        return [3, 35];
+                    case 34:
                         error_7 = _p.sent();
                         console.log(error_7);
-                        return [3, 33];
-                    case 33:
-                        if (!(specialistToUsers.length > 0)) return [3, 35];
-                        return [4, sendEmail(process.env.B6_EMAIL_FROM, (0, lodash_1.join)((0, lodash_1.map)(specialistToUsers, 'email'), ';'), subject, '', microHtml, '')];
-                    case 34:
-                        _h = _p.sent();
-                        return [3, 36];
+                        return [3, 35];
                     case 35:
-                        _h = '无收件人';
-                        _p.label = 36;
+                        if (!(specialistToUsers.length > 0)) return [3, 37];
+                        return [4, sendEmail(process.env.B6_EMAIL_FROM, (0, lodash_1.join)((0, lodash_1.map)(specialistToUsers, 'email'), ';'), microSubject, '', microHtml, '')];
                     case 36:
-                        microResult = _h;
-                        _p.label = 37;
+                        _h = _p.sent();
+                        return [3, 38];
                     case 37:
-                        _p.trys.push([37, 53, , 54]);
+                        _h = '无收件人';
                         _p.label = 38;
                     case 38:
-                        _p.trys.push([38, 43, 44, 45]);
-                        departmentUserIds_1 = tslib_1.__values(departmentUserIds_2), departmentUserIds_1_1 = departmentUserIds_1.next();
+                        microResult = _h;
                         _p.label = 39;
                     case 39:
-                        if (!!departmentUserIds_1_1.done) return [3, 42];
+                        _p.trys.push([39, 55, , 56]);
+                        fromUserId = (user === null || user === void 0 ? void 0 : user.userId) || pool.owner || pool.created_by;
+                        _p.label = 40;
+                    case 40:
+                        _p.trys.push([40, 45, 46, 47]);
+                        departmentUserIds_1 = tslib_1.__values(departmentUserIds_2), departmentUserIds_1_1 = departmentUserIds_1.next();
+                        _p.label = 41;
+                    case 41:
+                        if (!!departmentUserIds_1_1.done) return [3, 44];
                         userId = departmentUserIds_1_1.value;
                         return [4, ctx.broker.call('notifications.add', {
                                 message: {
@@ -1065,35 +1118,35 @@ exports.generateSpotCheckPool = {
                                     body: '',
                                     related_to: { o: 'pepsico_spot_check_pool', ids: [pid] },
                                     related_name: pool.name || yearMonth,
-                                    from: user.userId,
+                                    from: fromUserId,
                                     space: pool.space
                                 },
-                                from: user.userId,
+                                from: fromUserId,
                                 to: userId
                             })];
-                    case 40:
+                    case 42:
                         _p.sent();
-                        _p.label = 41;
-                    case 41:
-                        departmentUserIds_1_1 = departmentUserIds_1.next();
-                        return [3, 39];
-                    case 42: return [3, 45];
+                        _p.label = 43;
                     case 43:
+                        departmentUserIds_1_1 = departmentUserIds_1.next();
+                        return [3, 41];
+                    case 44: return [3, 47];
+                    case 45:
                         e_7_1 = _p.sent();
                         e_7 = { error: e_7_1 };
-                        return [3, 45];
-                    case 44:
+                        return [3, 47];
+                    case 46:
                         try {
                             if (departmentUserIds_1_1 && !departmentUserIds_1_1.done && (_m = departmentUserIds_1.return)) _m.call(departmentUserIds_1);
                         }
                         finally { if (e_7) throw e_7.error; }
                         return [7];
-                    case 45:
-                        _p.trys.push([45, 50, 51, 52]);
+                    case 47:
+                        _p.trys.push([47, 52, 53, 54]);
                         specialistUserIds_1 = tslib_1.__values(specialistUserIds_2), specialistUserIds_1_1 = specialistUserIds_1.next();
-                        _p.label = 46;
-                    case 46:
-                        if (!!specialistUserIds_1_1.done) return [3, 49];
+                        _p.label = 48;
+                    case 48:
+                        if (!!specialistUserIds_1_1.done) return [3, 51];
                         userId = specialistUserIds_1_1.value;
                         return [4, ctx.broker.call('notifications.add', {
                                 message: {
@@ -1101,49 +1154,74 @@ exports.generateSpotCheckPool = {
                                     body: '',
                                     related_to: { o: 'pepsico_spot_check_pool', ids: [pid] },
                                     related_name: pool.name || yearMonth,
-                                    from: user.userId,
+                                    from: fromUserId,
                                     space: pool.space
                                 },
-                                from: user.userId,
+                                from: fromUserId,
                                 to: userId
                             })];
-                    case 47:
+                    case 49:
                         _p.sent();
-                        _p.label = 48;
-                    case 48:
-                        specialistUserIds_1_1 = specialistUserIds_1.next();
-                        return [3, 46];
-                    case 49: return [3, 52];
+                        _p.label = 50;
                     case 50:
+                        specialistUserIds_1_1 = specialistUserIds_1.next();
+                        return [3, 48];
+                    case 51: return [3, 54];
+                    case 52:
                         e_8_1 = _p.sent();
                         e_8 = { error: e_8_1 };
-                        return [3, 52];
-                    case 51:
+                        return [3, 54];
+                    case 53:
                         try {
                             if (specialistUserIds_1_1 && !specialistUserIds_1_1.done && (_o = specialistUserIds_1.return)) _o.call(specialistUserIds_1);
                         }
                         finally { if (e_8) throw e_8.error; }
                         return [7];
-                    case 52: return [3, 54];
-                    case 53:
+                    case 54: return [3, 56];
+                    case 55:
                         error_8 = _p.sent();
                         console.log('站内通知发送失败:', error_8);
-                        return [3, 54];
-                    case 54: return [4, ctx.getObject('pepsico_spot_check_pool').directUpdate(pid, {
+                        return [3, 56];
+                    case 56: return [4, ctx.getObject('pepsico_spot_check_pool').directUpdate(pid, {
                             mail_send: true,
                             mail_send_date: new Date(),
                             mid_tier_pepsico_material: (0, lodash_1.map)(pools['Mid-tier'].samplingPool, '_id'),
                             micro_pepsico_material: (0, lodash_1.map)(pools['Micro'].samplingPool, '_id'),
-                            logs: logs + '\r\n' + "=== \u53D1\u9001\u90AE\u4EF6\uFF08\u56DB\u90E8\u95E8-\u8170\u90E8\uFF09 === \r\n\n                \u90AE\u4EF6\u4E3B\u9898: ".concat(subject, "\r\n\n                \u6536\u4EF6\u4EBA: ").concat((0, lodash_1.join)((0, lodash_1.map)(departmentToUsers, 'email'), ';'), "\r\n\n                \u90AE\u4EF6\u5185\u5BB9: ").concat(midTierHtml, "\r\n\n                \u90AE\u4EF6\u53D1\u9001\u7ED3\u679C: ").concat(midTierResult, "\r\n\n                === \u53D1\u9001\u90AE\u4EF6\uFF08\u4E13\u5458-\u5C3E\u90E8\uFF09 === \r\n\n                \u90AE\u4EF6\u4E3B\u9898: ").concat(subject, "\r\n\n                \u6536\u4EF6\u4EBA: ").concat((0, lodash_1.join)((0, lodash_1.map)(specialistToUsers, 'email'), ';'), "\r\n\n                \u90AE\u4EF6\u5185\u5BB9: ").concat(microHtml, "\r\n\n                \u90AE\u4EF6\u53D1\u9001\u7ED3\u679C: ").concat(microResult, "\n                ")
+                            logs: logs + '\r\n' + "=== \u53D1\u9001\u90AE\u4EF6\uFF08\u56DB\u90E8\u95E8-\u8170\u90E8\uFF09 === \r\n\n                \u90AE\u4EF6\u4E3B\u9898: ".concat(midTierSubject, "\r\n\n                \u6536\u4EF6\u4EBA: ").concat((0, lodash_1.join)((0, lodash_1.map)(departmentToUsers, 'email'), ';'), "\r\n\n                \u90AE\u4EF6\u5185\u5BB9: ").concat(midTierHtml, "\r\n\n                \u90AE\u4EF6\u53D1\u9001\u7ED3\u679C: ").concat(midTierResult, "\r\n\n                === \u53D1\u9001\u90AE\u4EF6\uFF08\u4E13\u5458-\u5C3E\u90E8\uFF09 === \r\n\n                \u90AE\u4EF6\u4E3B\u9898: ").concat(microSubject, "\r\n\n                \u6536\u4EF6\u4EBA: ").concat((0, lodash_1.join)((0, lodash_1.map)(specialistToUsers, 'email'), ';'), "\r\n\n                \u90AE\u4EF6\u5185\u5BB9: ").concat(microHtml, "\r\n\n                \u90AE\u4EF6\u53D1\u9001\u7ED3\u679C: ").concat(microResult, "\n                ")
                         })];
-                    case 55:
+                    case 57:
                         _p.sent();
-                        return [3, 57];
-                    case 56:
+                        return [2, {
+                                status: 200,
+                                msg: '抽查素材池邮件发送完成',
+                                data: {
+                                    year_month: yearMonth,
+                                    count: pools.count,
+                                    mid_tier_count: pools['Mid-tier'].samplingPool.length,
+                                    micro_count: pools['Micro'].samplingPool.length,
+                                    mid_tier_mail_result: midTierResult,
+                                    micro_mail_result: microResult
+                                }
+                            }];
+                    case 58:
                         error_9 = _p.sent();
+                        message = (error_9 === null || error_9 === void 0 ? void 0 : error_9.message) || String(error_9);
                         console.error('执行失败:', error_9);
-                        return [3, 57];
-                    case 57: return [2];
+                        _p.label = 59;
+                    case 59:
+                        _p.trys.push([59, 61, , 62]);
+                        return [4, ctx.getObject('pepsico_spot_check_pool').directUpdate(pid, {
+                                logs: "[".concat(yearMonth, "] \u62BD\u67E5\u7D20\u6750\u6C60\u90AE\u4EF6\u53D1\u9001\u5931\u8D25\uFF1A").concat(message)
+                            })];
+                    case 60:
+                        _p.sent();
+                        return [3, 62];
+                    case 61:
+                        updateError_1 = _p.sent();
+                        console.error('记录抽查素材池失败日志失败:', updateError_1);
+                        return [3, 62];
+                    case 62: throw error_9;
+                    case 63: return [2];
                 }
             });
         });
@@ -1152,29 +1230,47 @@ exports.generateSpotCheckPool = {
 exports.remindSpotCheckIncomplete = {
     rest: {
         method: "GET",
-        path: "/remind/spot-check-incomplete"
+        fullPath: "/api/pepsico-content/remind/spot-check-incomplete"
     },
     handler: function (ctx) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var yearMonth, pendingUsers, midTierMaterials, midTierMaterials_1, midTierMaterials_1_1, material, deptFields, deptFields_1, deptFields_1_1, _a, done, user, users, users_2, users_2_1, uid, existing, microMaterials, microMaterials_1, microMaterials_1_1, material, users, users_3, users_3_1, uid, existing, ROOT_URL, midTierLink, microLink, subject, results, userIds, spaceUsers, _loop_2, pendingUsers_1, pendingUsers_1_1, _b, userId, info, e_10_1;
+            var user, logger, yearMonth, pendingUsers, midTierMaterials, midTierMaterials_1, midTierMaterials_1_1, material, deptFields, deptFields_1, deptFields_1_1, _a, done, user_1, users, users_2, users_2_1, uid, existing, microMaterials, microMaterials_1, microMaterials_1_1, material, users, users_3, users_3_1, uid, existing, ROOT_URL, midTierLink, microLink, subject, results, userIds, spaceUsers, _loop_2, pendingUsers_1, pendingUsers_1_1, _b, userId, info, e_10_1;
             var e_11, _c, e_12, _d, e_13, _e, e_14, _f, e_15, _g, e_10, _h;
             return tslib_1.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
+                        user = ctx.meta.user;
+                        if (user && !user.is_space_admin) {
+                            throw new Error('无权限');
+                        }
+                        ctx.getObject = this.getObject;
+                        return [4, this.getLogger()];
+                    case 1:
+                        logger = _j.sent();
+                        ctx.logger = logger;
                         yearMonth = moment().format('YYYY-MM');
-                        console.log("[remindSpotCheckIncomplete] \u5F00\u59CB\u626B\u63CF ".concat(yearMonth, " \u672A\u5B8C\u6210\u62BD\u67E5\u4EFB\u52A1..."));
+                        console.log("[remindSpotCheckIncomplete] \u5F00\u59CB\u626B\u63CF\u622A\u6B62\u76EE\u524D\u6240\u6709\u672A\u5B8C\u6210\u62BD\u67E5\u4EFB\u52A1...");
+                        return [4, logger.info('[抽查催办] 开始扫描截止目前所有未完成抽查任务', {
+                                yearMonth: yearMonth
+                            })];
+                    case 2:
+                        _j.sent();
                         pendingUsers = new Map();
                         return [4, ctx.getObject('pepsico_material').find({
                                 filters: [
-                                    ['spot_check_pool_year_month', '=', yearMonth],
                                     ['spot_checked', '=', true],
                                     ['spot_checked_done', '!=', true],
                                     ['spot_check_type', '=', '四部门抽查']
                                 ]
                             })];
-                    case 1:
+                    case 3:
                         midTierMaterials = _j.sent();
                         console.log("[remindSpotCheckIncomplete] \u8170\u90E8\u672A\u5B8C\u6210\u7D20\u6750: ".concat(midTierMaterials.length));
+                        return [4, logger.info('[抽查催办] 腰部未完成素材统计', {
+                                count: midTierMaterials.length
+                            })];
+                    case 4:
+                        _j.sent();
                         try {
                             for (midTierMaterials_1 = tslib_1.__values(midTierMaterials), midTierMaterials_1_1 = midTierMaterials_1.next(); !midTierMaterials_1_1.done; midTierMaterials_1_1 = midTierMaterials_1.next()) {
                                 material = midTierMaterials_1_1.value;
@@ -1186,15 +1282,15 @@ exports.remindSpotCheckIncomplete = {
                                 ];
                                 try {
                                     for (deptFields_1 = (e_12 = void 0, tslib_1.__values(deptFields)), deptFields_1_1 = deptFields_1.next(); !deptFields_1_1.done; deptFields_1_1 = deptFields_1.next()) {
-                                        _a = deptFields_1_1.value, done = _a.done, user = _a.user;
-                                        if (!material[done] && material[user]) {
-                                            users = Array.isArray(material[user]) ? material[user] : [material[user]];
+                                        _a = deptFields_1_1.value, done = _a.done, user_1 = _a.user;
+                                        if (!material[done] && material[user_1]) {
+                                            users = Array.isArray(material[user_1]) ? material[user_1] : [material[user_1]];
                                             try {
                                                 for (users_2 = (e_13 = void 0, tslib_1.__values(users)), users_2_1 = users_2.next(); !users_2_1.done; users_2_1 = users_2.next()) {
                                                     uid = users_2_1.value;
                                                     if (uid) {
-                                                        existing = pendingUsers.get(uid) || { count: 0, type: '四部门抽查' };
-                                                        existing.count++;
+                                                        existing = pendingUsers.get(uid) || { midTierCount: 0, microCount: 0 };
+                                                        existing.midTierCount++;
                                                         pendingUsers.set(uid, existing);
                                                     }
                                                 }
@@ -1227,15 +1323,19 @@ exports.remindSpotCheckIncomplete = {
                         }
                         return [4, ctx.getObject('pepsico_material').find({
                                 filters: [
-                                    ['spot_check_pool_year_month', '=', yearMonth],
                                     ['spot_checked', '=', true],
                                     ['spot_checked_done', '!=', true],
                                     ['spot_check_type', '=', '审核专员抽查']
                                 ]
                             })];
-                    case 2:
+                    case 5:
                         microMaterials = _j.sent();
                         console.log("[remindSpotCheckIncomplete] \u5C3E\u90E8\u672A\u5B8C\u6210\u7D20\u6750: ".concat(microMaterials.length));
+                        return [4, logger.info('[抽查催办] 尾部未完成素材统计', {
+                                count: microMaterials.length
+                            })];
+                    case 6:
+                        _j.sent();
                         try {
                             for (microMaterials_1 = tslib_1.__values(microMaterials), microMaterials_1_1 = microMaterials_1.next(); !microMaterials_1_1.done; microMaterials_1_1 = microMaterials_1.next()) {
                                 material = microMaterials_1_1.value;
@@ -1245,8 +1345,8 @@ exports.remindSpotCheckIncomplete = {
                                         for (users_3 = (e_15 = void 0, tslib_1.__values(users)), users_3_1 = users_3.next(); !users_3_1.done; users_3_1 = users_3.next()) {
                                             uid = users_3_1.value;
                                             if (uid) {
-                                                existing = pendingUsers.get(uid) || { count: 0, type: '审核专员抽查' };
-                                                existing.count++;
+                                                existing = pendingUsers.get(uid) || { midTierCount: 0, microCount: 0 };
+                                                existing.microCount++;
                                                 pendingUsers.set(uid, existing);
                                             }
                                         }
@@ -1268,30 +1368,47 @@ exports.remindSpotCheckIncomplete = {
                             }
                             finally { if (e_14) throw e_14.error; }
                         }
-                        if (pendingUsers.size === 0) {
-                            console.log("[remindSpotCheckIncomplete] \u5F53\u6708\u65E0\u672A\u5B8C\u6210\u62BD\u67E5\u4EFB\u52A1\uFF0C\u65E0\u9700\u50AC\u529E\u3002");
-                            return [2, { success: true, message: '无未完成抽查任务' }];
-                        }
+                        if (!(pendingUsers.size === 0)) return [3, 8];
+                        console.log("[remindSpotCheckIncomplete] \u65E0\u672A\u5B8C\u6210\u62BD\u67E5\u4EFB\u52A1\uFF0C\u65E0\u9700\u50AC\u529E\u3002");
+                        return [4, logger.info('[抽查催办] 无未完成抽查任务，无需催办', {
+                                midTierCount: midTierMaterials.length,
+                                microCount: microMaterials.length
+                            })];
+                    case 7:
+                        _j.sent();
+                        return [2, { success: true, message: '无未完成抽查任务' }];
+                    case 8:
                         console.log("[remindSpotCheckIncomplete] \u9700\u50AC\u529E\u7528\u6237\u6570: ".concat(pendingUsers.size));
+                        return [4, logger.info('[抽查催办] 需催办用户统计', {
+                                userCount: pendingUsers.size,
+                                midTierCount: midTierMaterials.length,
+                                microCount: microMaterials.length
+                            })];
+                    case 9:
+                        _j.sent();
                         ROOT_URL = process.env.ROOT_URL;
-                        midTierLink = "".concat(ROOT_URL, "/app/pepsico_content_review/pepsico_midtier_spot_check");
-                        microLink = "".concat(ROOT_URL, "/app/pepsico_content_review/pepsico_spot_check");
-                        subject = '【催办通知】您有未完成的抽查任务';
+                        midTierLink = "".concat(ROOT_URL, "/app/pepsico_content_review/page/pepsico_midtier_spot_check");
+                        microLink = "".concat(ROOT_URL, "/app/pepsico_content_review/page/pepsico_spot_check");
+                        subject = '【系统通知】您有未完成的腰部/尾部素材抽查工作';
                         results = [];
                         userIds = Array.from(pendingUsers.keys());
                         return [4, ctx.getObject('space_users').find({ filters: ['user', 'in', userIds] })];
-                    case 3:
+                    case 10:
                         spaceUsers = _j.sent();
                         _loop_2 = function (userId, info) {
-                            var spaceUser, link, html, error_10, error_11;
+                            var spaceUser, totalCount, linkHtml, html, error_10, error_11;
                             return tslib_1.__generator(this, function (_k) {
                                 switch (_k.label) {
                                     case 0:
                                         spaceUser = (0, lodash_1.find)(spaceUsers, function (u) { return u.user === userId; });
                                         if (!spaceUser)
                                             return [2, "continue"];
-                                        link = info.type === '四部门抽查' ? midTierLink : microLink;
-                                        html = "\n                <p>\u4EB2\u7231\u7684\u5BA1\u6838\u8001\u5E08\uFF0C</p>\n                <p>\u60A8\u5728\u3010".concat(yearMonth, "\u3011\u62BD\u67E5\u5E93\u4E2D\u4ECD\u6709 <b>").concat(info.count, "</b> \u4E2A\u7D20\u6750\u5C1A\u672A\u5B8C\u6210\u62BD\u67E5\uFF0C\u8BF7\u5728\u6708\u5E95\u524D\u5B8C\u6210\u3002</p>\n                <p>\u8BF7\u70B9\u51FB\u4EE5\u4E0B\u94FE\u63A5\u8FDB\u5165\u62BD\u67E5\u9875\u9762\uFF1A</p>\n                <p><a href=\"").concat(link, "\">\u70B9\u51FB\u8FDB\u5165\u62BD\u67E5</a></p>\n                <p>\u5982\u6709\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u3002</p>\n            ");
+                                        totalCount = info.midTierCount + info.microCount;
+                                        linkHtml = [
+                                            info.midTierCount > 0 ? "<p><a href=\"".concat(midTierLink, "\">\u70B9\u51FB\u8FDB\u5165\u8170\u90E8\u7D20\u6750\u62BD\u67E5</a></p>") : '',
+                                            info.microCount > 0 ? "<p><a href=\"".concat(microLink, "\">\u70B9\u51FB\u8FDB\u5165\u5C3E\u90E8\u7D20\u6750\u62BD\u67E5</a></p>") : ''
+                                        ].join('');
+                                        html = "\n                <p>\u4EB2\u7231\u7684\u5BA1\u6838\u8001\u5E08\uFF0C</p>\n                <p>\u60A8\u5728\u5BA1\u6838\u7CFB\u7EDF\uFF0C\u8170\u90E8/\u5C3E\u90E8\u7D20\u6750\u62BD\u67E5\u5E93\u4E2D\u8FD8\u6709 <b>".concat(totalCount, "</b> \u4E2A\u7D20\u6750\u672A\u5B8C\u6210\u62BD\u67E5\u5DE5\u4F5C\uFF0C\u8BF7\u767B\u5F55\u7CFB\u7EDF\u8FDB\u884C\u62BD\u67E5\u3002</p>\n                <p>\u8BF7\u70B9\u51FB\u4EE5\u4E0B\u94FE\u63A5\u8FDB\u5165\u62BD\u67E5\u9875\u9762\uFF1A</p>\n                ").concat(linkHtml, "\n                <p>\u5982\u6709\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u3002</p>\n            ");
                                         if (!(spaceUser.email && spaceUser.email.endsWith('@pepsico.com'))) return [3, 4];
                                         _k.label = 1;
                                     case 1:
@@ -1310,7 +1427,7 @@ exports.remindSpotCheckIncomplete = {
                                         _k.trys.push([4, 6, , 7]);
                                         return [4, ctx.broker.call('notifications.add', {
                                                 message: {
-                                                    name: "\u3010\u50AC\u529E\u3011\u60A8\u6709 ".concat(info.count, " \u4E2A\u7D20\u6750\u672A\u5B8C\u6210\u62BD\u67E5\uFF0C\u8BF7\u5C3D\u5FEB\u5904\u7406"),
+                                                    name: "\u3010\u50AC\u529E\u3011\u60A8\u6709 ".concat(totalCount, " \u4E2A\u7D20\u6750\u672A\u5B8C\u6210\u62BD\u67E5\uFF0C\u8BF7\u5C3D\u5FEB\u5904\u7406"),
                                                     body: '',
                                                     related_to: { o: 'pepsico_material', ids: [] },
                                                     related_name: "".concat(yearMonth, " \u62BD\u67E5\u50AC\u529E"),
@@ -1331,34 +1448,40 @@ exports.remindSpotCheckIncomplete = {
                                 }
                             });
                         };
-                        _j.label = 4;
-                    case 4:
-                        _j.trys.push([4, 9, 10, 11]);
+                        _j.label = 11;
+                    case 11:
+                        _j.trys.push([11, 16, 17, 18]);
                         pendingUsers_1 = tslib_1.__values(pendingUsers), pendingUsers_1_1 = pendingUsers_1.next();
-                        _j.label = 5;
-                    case 5:
-                        if (!!pendingUsers_1_1.done) return [3, 8];
+                        _j.label = 12;
+                    case 12:
+                        if (!!pendingUsers_1_1.done) return [3, 15];
                         _b = tslib_1.__read(pendingUsers_1_1.value, 2), userId = _b[0], info = _b[1];
                         return [5, _loop_2(userId, info)];
-                    case 6:
+                    case 13:
                         _j.sent();
-                        _j.label = 7;
-                    case 7:
+                        _j.label = 14;
+                    case 14:
                         pendingUsers_1_1 = pendingUsers_1.next();
-                        return [3, 5];
-                    case 8: return [3, 11];
-                    case 9:
+                        return [3, 12];
+                    case 15: return [3, 18];
+                    case 16:
                         e_10_1 = _j.sent();
                         e_10 = { error: e_10_1 };
-                        return [3, 11];
-                    case 10:
+                        return [3, 18];
+                    case 17:
                         try {
                             if (pendingUsers_1_1 && !pendingUsers_1_1.done && (_h = pendingUsers_1.return)) _h.call(pendingUsers_1);
                         }
                         finally { if (e_10) throw e_10.error; }
                         return [7];
-                    case 11:
+                    case 18:
                         console.log("[remindSpotCheckIncomplete] \u50AC\u529E\u5B8C\u6210\u3002\u7ED3\u679C:", results);
+                        return [4, logger.info('[抽查催办] 催办完成', {
+                                userCount: pendingUsers.size,
+                                results: results
+                            })];
+                    case 19:
+                        _j.sent();
                         return [2, { success: true, yearMonth: yearMonth, totalUsers: pendingUsers.size, results: results }];
                 }
             });