浏览代码

审批意见

MaiXinRong 4 年之前
父节点
当前提交
1e59b4ea13
共有 2 个文件被更改,包括 20 次插入10 次删除
  1. 17 9
      app/service/report.js
  2. 3 1
      app/service/stage_audit.js

+ 17 - 9
app/service/report.js

@@ -170,6 +170,10 @@ module.exports = app => {
                             runnableRst.push(service.ledgerCooperation.getValidData(params.tender_id));
                             runnableKey.push(filter);
                             break;
+                        case 'mem_sign_select':
+                            runnableRst.push(service.reportMemory.getSignSelect(params.tender_id, params.stage_id, customSelect));
+                            runnableKey.push(filter);
+                            break;
                         default:
                             break;
                     }
@@ -182,15 +186,19 @@ module.exports = app => {
             for (const filter of filters) {
                 switch (filter) {
                     // test模式下,上方Promise.all的方式,取不到以下3个数据
-                    // case 'ledger_cooperation':
-                    //     rst[filter] = await service.ledgerCooperation.getValidData(params.tender_id);
-                    //     break;
-                    // case 'stage_audit':
-                    //     rst[filter] = await service.reportMemory.getStageAuditors(params.tender_id, params.stage_id), memFieldKeys[filter];
-                    //     break;
-                    // case 'mem_stage_im_zl':
-                    //     rst[filter] = await service.reportMemory.getStageImZlData(params.tender_id, params.stage_id, memFieldKeys[filter]);
-                    //     break;
+                    case 'ledger_cooperation':
+                        rst[filter] = await service.ledgerCooperation.getValidData(params.tender_id);
+                        break;
+                    case 'stage_audit':
+                        rst[filter] = await service.reportMemory.getStageAuditors(params.tender_id, params.stage_id), memFieldKeys[filter];
+                        break;
+                    case 'mem_stage_im_zl':
+                        rst[filter] = await service.reportMemory.getStageImZlData(params.tender_id, params.stage_id, memFieldKeys[filter]);
+                        break;
+                    case 'mem_sign_select':
+                        rst[filter] = await service.reportMemory.getSignSelect(params.tender_id, params.stage_id, customSelect);
+                        break;
+
                     case 'mem_stage_im_tz':
                         rst[filter] = await service.reportMemory.getStageImTzData(params.tender_id, params.stage_id, memFieldKeys[filter]);
                         break;

+ 3 - 1
app/service/stage_audit.js

@@ -1317,11 +1317,13 @@ module.exports = app => {
             for (const r of result) {
                 const auditor = await this.getDataByCondition({sid: stageId, times: r.times, order: r.max_order});
                 r.opinion = auditor.opinion;
-                r.en_time = auditor.end_time;
+                r.begin_time = auditor.begin_time;
+                r.end_time = auditor.end_time;
             }
             return result;
         }
     }
 
     return StageAudit;
+    return StageAudit;
 };