|  | @@ -8,6 +8,8 @@
 | 
												
													
														
															|  |   * @version
 |  |   * @version
 | 
												
													
														
															|  |   */
 |  |   */
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  | 
 |  | +const rptCustomData = require('../lib/rptCustomData');
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  |  module.exports = app => {
 |  |  module.exports = app => {
 | 
												
													
														
															|  |      class Report extends app.BaseService {
 |  |      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]);
 |  |                          rst[filter] = await service.reportMemory.getChangeBillsData(params.tender_id, params.stage_id, memFieldKeys[filter]);
 | 
												
													
														
															|  |                          break;
 |  |                          break;
 | 
												
													
														
															|  |                      case 'mem_jh_im_change':
 |  |                      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;
 |  |                          break;
 | 
												
													
														
															|  |                      case 'mem_jh_gather_im_change':
 |  |                      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;
 |  |                          break;
 | 
												
													
														
															|  |                      // case 'mem_material_bills':
 |  |                      // case 'mem_material_bills':
 | 
												
													
														
															|  |                      //     rst[filter] = await service.rptGatherMemory.getMaterialBills(params.tender_id, params.material_order, memFieldKeys[filter]);
 |  |                      //     rst[filter] = await service.rptGatherMemory.getMaterialBills(params.tender_id, params.material_order, memFieldKeys[filter]);
 |