MaiXinRong %!s(int64=4) %!d(string=hai) anos
pai
achega
3106289659
Modificáronse 1 ficheiros con 6 adicións e 6 borrados
  1. 6 6
      app/service/report.js

+ 6 - 6
app/service/report.js

@@ -8,6 +8,8 @@
  * @version
  */
 
+const rptCustomData = require('../lib/rptCustomData');
+
 module.exports = app => {
     class Report extends app.BaseService {
 
@@ -235,14 +237,12 @@ module.exports = app => {
                         rst[filter] = await service.reportMemory.getChangeBillsData(params.tender_id, params.stage_id, memFieldKeys[filter]);
                         break;
                     case 'mem_jh_im_change':
-                        const rptCustomData = require('../lib/rptCustomData');
-                        const jhHelper = new rptCustomData.jhHelper(this.ctx);
-                        rst[filter] = await jhHelper.convert(params.tender_id, params.stage_id, memFieldKeys[filter], customDefine.setting);
+                        const jhHelper1 = new rptCustomData.jhHelper(this.ctx);
+                        rst[filter] = await jhHelper1.convert(params.tender_id, params.stage_id, memFieldKeys[filter], customDefine.setting);
                         break;
                     case 'mem_jh_gather_im_change':
-                        const rptCustomData = require('../lib/rptCustomData');
-                        const jhHelper = new rptCustomData.jhHelper(this.ctx);
-                        rst[filter] = await jhHelper.gather(memFieldKeys[filter], customDefine.gather_select, customSelect ? customSelect.gather_select : null);
+                        const jhHelper2 = new rptCustomData.jhHelper(this.ctx);
+                        rst[filter] = await jhHelper2.gather(memFieldKeys[filter], customDefine.gather_select, customSelect ? customSelect.gather_select : null);
                         break;
                     // case 'mem_material_bills':
                     //     rst[filter] = await service.rptGatherMemory.getMaterialBills(params.tender_id, params.material_order, memFieldKeys[filter]);