|
@@ -20,6 +20,7 @@ project_docids = "docids"
|
|
project_zhao_biao_page_time = "zhao_biao_page_time"
|
|
project_zhao_biao_page_time = "zhao_biao_page_time"
|
|
project_zhong_biao_page_time = "zhong_biao_page_time"
|
|
project_zhong_biao_page_time = "zhong_biao_page_time"
|
|
project_page_time = "page_time"
|
|
project_page_time = "page_time"
|
|
|
|
+project_docchannel = "docchannel"
|
|
project_doctextcon = "doctextcon"
|
|
project_doctextcon = "doctextcon"
|
|
project_area = "area"
|
|
project_area = "area"
|
|
project_province = "province"
|
|
project_province = "province"
|
|
@@ -1628,6 +1629,7 @@ def generate_common_properties(list_docs):
|
|
|
|
|
|
list_product = []
|
|
list_product = []
|
|
p_page_time = ""
|
|
p_page_time = ""
|
|
|
|
+ p_docchanel = 0
|
|
remove_docids = set()
|
|
remove_docids = set()
|
|
set_nlp_enterprise = set()
|
|
set_nlp_enterprise = set()
|
|
set_nlp_enterprise_attachment = set()
|
|
set_nlp_enterprise_attachment = set()
|
|
@@ -1639,7 +1641,7 @@ def generate_common_properties(list_docs):
|
|
status = _doc.get(document_status,0)
|
|
status = _doc.get(document_status,0)
|
|
_save = _doc.get(document_tmp_save,1)
|
|
_save = _doc.get(document_tmp_save,1)
|
|
doctitle = _doc.get(document_doctitle,"")
|
|
doctitle = _doc.get(document_doctitle,"")
|
|
- docchannel = _doc.get(document_docchannel)
|
|
|
|
|
|
+ docchannel = _doc.get(document_docchannel,0)
|
|
page_time = _doc.get(document_page_time,"")
|
|
page_time = _doc.get(document_page_time,"")
|
|
_docid = _doc.get(document_docid)
|
|
_docid = _doc.get(document_docid)
|
|
_bidway = _doc.get(document_bidway,"")
|
|
_bidway = _doc.get(document_bidway,"")
|
|
@@ -1683,6 +1685,11 @@ def generate_common_properties(list_docs):
|
|
|
|
|
|
if p_page_time=="":
|
|
if p_page_time=="":
|
|
p_page_time = page_time
|
|
p_page_time = page_time
|
|
|
|
+ p_docchanel = docchannel
|
|
|
|
+ else:
|
|
|
|
+ if p_page_time<page_time:
|
|
|
|
+ p_page_time = page_time
|
|
|
|
+ p_docchanel = docchannel
|
|
|
|
|
|
if zhao_biao_page_time=="" and _docchannel in (51,52,102,103,114):
|
|
if zhao_biao_page_time=="" and _docchannel in (51,52,102,103,114):
|
|
zhao_biao_page_time = page_time
|
|
zhao_biao_page_time = page_time
|
|
@@ -1728,6 +1735,7 @@ def generate_common_properties(list_docs):
|
|
project_dict[project_zhong_biao_page_time] = zhong_biao_page_time
|
|
project_dict[project_zhong_biao_page_time] = zhong_biao_page_time
|
|
project_dict[project_project_codes] = ",".join(list(set(list_codes)))
|
|
project_dict[project_project_codes] = ",".join(list(set(list_codes)))
|
|
project_dict[project_page_time] = p_page_time
|
|
project_dict[project_page_time] = p_page_time
|
|
|
|
+ project_dict[project_docchannel] = p_docchanel
|
|
project_dict[project_product] = ",".join(list(set(list_product)))
|
|
project_dict[project_product] = ",".join(list(set(list_product)))
|
|
project_dict[project_nlp_enterprise] = json.dumps(list(set_nlp_enterprise)[:100],ensure_ascii=False)
|
|
project_dict[project_nlp_enterprise] = json.dumps(list(set_nlp_enterprise)[:100],ensure_ascii=False)
|
|
project_dict[project_nlp_enterprise_attachment] = json.dumps(list(set_nlp_enterprise_attachment)[:100],ensure_ascii=False)
|
|
project_dict[project_nlp_enterprise_attachment] = json.dumps(list(set_nlp_enterprise_attachment)[:100],ensure_ascii=False)
|
|
@@ -2247,8 +2255,9 @@ def update_projects_by_project(project_dict,projects):
|
|
|
|
|
|
for _proj in projects:
|
|
for _proj in projects:
|
|
_proj.update(_dict)
|
|
_proj.update(_dict)
|
|
- if str(_proj.get(project_page_time,""))<str(project_dict.get(project_page_time,"")):
|
|
|
|
|
|
+ if str(_proj.get(project_page_time,""))<=str(project_dict.get(project_page_time,"")):
|
|
_proj[project_page_time] = project_dict.get(project_page_time,"")
|
|
_proj[project_page_time] = project_dict.get(project_page_time,"")
|
|
|
|
+ _proj[project_docchannel] = project_dict.get(project_docchannel,"")
|
|
if project_dict.get(project_sub_project_name) is not None and project_dict.get(project_sub_project_name) not in {"","Project"}:
|
|
if project_dict.get(project_sub_project_name) is not None and project_dict.get(project_sub_project_name) not in {"","Project"}:
|
|
if not (_proj.get(project_sub_project_name) is not None and _proj.get(project_sub_project_name) not in {"","Project"}):
|
|
if not (_proj.get(project_sub_project_name) is not None and _proj.get(project_sub_project_name) not in {"","Project"}):
|
|
_proj[project_sub_project_name] = project_dict.get(project_sub_project_name)
|
|
_proj[project_sub_project_name] = project_dict.get(project_sub_project_name)
|