|
@@ -1283,12 +1283,14 @@ class SampleService:
|
|
|
# 关联主表字段:file_url, conversion_status, md_url, json_url
|
|
# 关联主表字段:file_url, conversion_status, md_url, json_url
|
|
|
fields = """
|
|
fields = """
|
|
|
s.id, s.chinese_name as title, s.standard_number as standard_no,
|
|
s.id, s.chinese_name as title, s.standard_number as standard_no,
|
|
|
- s.issuing_authority, s.release_date, s.document_type,
|
|
|
|
|
- s.professional_field, s.validity, s.note,
|
|
|
|
|
|
|
+ s.issuing_authority, s.release_date, s.implementation_date,
|
|
|
|
|
+ s.drafting_unit, s.approving_department,
|
|
|
|
|
+ s.document_type, s.professional_field, s.validity, s.note,
|
|
|
s.participating_units, s.reference_basis,
|
|
s.participating_units, s.reference_basis,
|
|
|
s.created_by, u1.username as creator_name, s.created_time,
|
|
s.created_by, u1.username as creator_name, s.created_time,
|
|
|
s.updated_by, u2.username as updater_name, s.updated_time,
|
|
s.updated_by, u2.username as updater_name, s.updated_time,
|
|
|
- m.file_url, m.conversion_status, m.md_url, m.json_url, m.kb_id, m.whether_to_enter
|
|
|
|
|
|
|
+ m.file_url, m.conversion_status, m.md_url, m.json_url, m.kb_id, m.whether_to_enter,
|
|
|
|
|
+ m.source_type
|
|
|
"""
|
|
"""
|
|
|
field_map = {
|
|
field_map = {
|
|
|
'title': 's.chinese_name',
|
|
'title': 's.chinese_name',
|
|
@@ -1305,6 +1307,7 @@ class SampleService:
|
|
|
s.id, s.plan_name as title, NULL as standard_no,
|
|
s.id, s.plan_name as title, NULL as standard_no,
|
|
|
s.project_name, s.project_section,
|
|
s.project_name, s.project_section,
|
|
|
s.compiling_unit as issuing_authority, s.compiling_date as release_date,
|
|
s.compiling_unit as issuing_authority, s.compiling_date as release_date,
|
|
|
|
|
+ NULL as implementation_date, NULL as drafting_unit, NULL as approving_department,
|
|
|
NULL as document_type, NULL as professional_field, NULL as validity,
|
|
NULL as document_type, NULL as professional_field, NULL as validity,
|
|
|
s.plan_summary, s.compilation_basis,
|
|
s.plan_summary, s.compilation_basis,
|
|
|
s.plan_category, s.level_1_classification, s.level_2_classification,
|
|
s.plan_category, s.level_1_classification, s.level_2_classification,
|
|
@@ -1312,7 +1315,8 @@ class SampleService:
|
|
|
s.note,
|
|
s.note,
|
|
|
s.created_by, u1.username as creator_name, s.created_time,
|
|
s.created_by, u1.username as creator_name, s.created_time,
|
|
|
s.updated_by, u2.username as updater_name, s.updated_time,
|
|
s.updated_by, u2.username as updater_name, s.updated_time,
|
|
|
- m.file_url, m.conversion_status, m.md_url, m.json_url, m.kb_id, m.whether_to_enter
|
|
|
|
|
|
|
+ m.file_url, m.conversion_status, m.md_url, m.json_url, m.kb_id, m.whether_to_enter,
|
|
|
|
|
+ m.source_type
|
|
|
"""
|
|
"""
|
|
|
field_map = {
|
|
field_map = {
|
|
|
'title': 's.plan_name',
|
|
'title': 's.plan_name',
|
|
@@ -1333,7 +1337,8 @@ class SampleService:
|
|
|
s.note,
|
|
s.note,
|
|
|
s.created_by, u1.username as creator_name, s.created_time,
|
|
s.created_by, u1.username as creator_name, s.created_time,
|
|
|
s.updated_by, u2.username as updater_name, s.updated_time,
|
|
s.updated_by, u2.username as updater_name, s.updated_time,
|
|
|
- m.file_url, m.conversion_status, m.md_url, m.json_url, m.kb_id, m.whether_to_enter
|
|
|
|
|
|
|
+ m.file_url, m.conversion_status, m.md_url, m.json_url, m.kb_id, m.whether_to_enter,
|
|
|
|
|
+ m.source_type
|
|
|
"""
|
|
"""
|
|
|
field_map = {
|
|
field_map = {
|
|
|
'title': 's.file_name',
|
|
'title': 's.file_name',
|