|
|
@@ -498,6 +498,7 @@ class PreprojectFill():
|
|
|
tenderee = _row.get('tenderee')
|
|
|
demand_info = _row.get('demand_info')
|
|
|
project_name = _row.get('project_name')
|
|
|
+ procurement_system = _row.get('procurement_system')
|
|
|
|
|
|
if demand_info is not None and 'data":[]' not in demand_info:
|
|
|
result = process_purchaseIntention(docid, tenderee, demand_info, project_name)
|
|
|
@@ -538,6 +539,26 @@ class PreprojectFill():
|
|
|
doctitle_product_labels,core_field_product_labels = self.get_project_label(final_product, demand, _tenderee, "")
|
|
|
result_row['doctitle_product_labels'] = doctitle_product_labels
|
|
|
result_row['core_field_product_labels'] = core_field_product_labels
|
|
|
+ if tenderee==_tenderee:
|
|
|
+ result_row['procurement_system'] = procurement_system
|
|
|
+ else:
|
|
|
+ # 采购意向中项目的招标人与公告提取的不同，则查表
|
|
|
+ _query = BoolQuery(must_queries=[
|
|
|
+ TermQuery('name', _tenderee)
|
|
|
+ ])
|
|
|
+ _columns = ['procurement_system']
|
|
|
+ rows, next_token, total_count, is_all_succeed = self.ots_client.search("enterprise","enterprise_index",
|
|
|
+ SearchQuery(_query,sort=Sort(sorters=[FieldSort("bidi_id")]),
|
|
|
+ get_total_count=True,limit=1),
|
|
|
+ ColumnsToGet(_columns,ColumnReturnType.SPECIFIED))
|
|
|
+ _procurement_system = None
|
|
|
+ if len(rows) > 0:
|
|
|
+ dict_rows = getRow_ots(rows)
|
|
|
+ row = dict_rows[0]
|
|
|
+ _procurement_system = row.get('procurement_system')
|
|
|
+ if not _procurement_system:
|
|
|
+ _procurement_system = None
|
|
|
+ result_row['procurement_system'] = _procurement_system
|
|
|
|
|
|
# tenderee, product, may_begin, may_end, crtime, type, demand, project_name, bidding_budget, prob, json_docids, province, city, district,
|
|
|
# in_doctextcon, last_doctitle, last_tenderee_contact, last_tenderee_phone
|
|
|
@@ -552,7 +573,7 @@ class PreprojectFill():
|
|
|
|
|
|
def purchaseIntention_process_producer(self):
|
|
|
columns = ['tenderee','demand_info','project_name','province', 'city', 'district','doctitle', 'tenderee_contact',
|
|
|
- 'tenderee_phone', 'info_type']
|
|
|
+ 'tenderee_phone', 'info_type','procurement_system']
|
|
|
end_page_time = time.strftime("%Y-%m-%d",time.localtime())
|
|
|
start_page_time = timeAdd(end_page_time,days=-5)
|
|
|
|
