c041e431 by 周伟奇

Merge branch 'feature/gb_excel' into feature/0611

2 parents 49a5299a 9be470c1
......@@ -749,8 +749,10 @@ MVC_FIELD_ORDER_1_2 = (('1.机动车所有人/身份证名称/号码', '机动
('2.登记机关', '登记机关'),
('编号', '机动车登记证书编号'),)
MVC_FIELD_ORDER_3_4 = (
('机动车登记证书编号', '机动车登记证书编号'),
('姓名/名称', '姓名/名称'),
('身份证明名称/号码', '身份证明名称/号码'),
('转入地车辆管理所名称', '转入地车辆管理所名称'),
('转移登记日期', '转移登记日期'),
('抵押权人姓名/名称', '抵押权人姓名/名称'),
('抵押身份证明名称/号码', '抵押身份证明名称/号码'),
......@@ -793,8 +795,10 @@ MVC_SE_FIELD_ORDER_1_2 = (('9.车辆识别代号/车架号', '车辆识别代号
('4.机动车登记编号', '机动车登记编号'),
('编号', '机动车登记证书编号'),)
MVC_SE_FIELD_ORDER_3_4 = (
('机动车登记证书编号', '机动车登记证书编号'),
('姓名/名称', '姓名/名称'),
('身份证明名称/号码', '身份证明名称/号码'),
('转入地车辆管理所名称', '转入地车辆管理所名称'),
('转移登记日期', '转移登记日期'),
('抵押权人姓名/名称', '抵押权人姓名/名称'),
('抵押身份证明名称/号码', '抵押身份证明名称/号码'),
......
......@@ -78,12 +78,14 @@ class Command(BaseCommand, LoggerMixin):
if mvc_page == 'VehicleRegArea':
mvc_dict['姓名/名称'] = []
mvc_dict['身份证明名称/号码'] = []
mvc_dict['转入地车辆管理所名称'] = []
mvc_dict['转移登记日期'] = []
mvc_dict['抵押权人姓名/名称'] = []
mvc_dict['抵押身份证明名称/号码'] = []
mvc_dict['抵押登记日期'] = []
mvc_dict['解除抵押日期'] = []
mvc_res = mvc_dict.pop('results', {})
mvc_dict['机动车登记证书编号'] = mvc_res.get('register_no', {}).get('words', '')
for register_info in mvc_res.get('register_info', []):
if register_info.get('register_type', 0) == 2:
mvc_dict['姓名/名称'].append(
......@@ -92,6 +94,8 @@ class Command(BaseCommand, LoggerMixin):
register_info.get('details', {}).get('idno', {}).get('words', ''))
mvc_dict['转移登记日期'].append(
register_info.get('details', {}).get('date', {}).get('words', ''))
mvc_dict['转入地车辆管理所名称'].append(
register_info.get('details', {}).get('office_name', {}).get('words', ''))
elif register_info.get('register_type', 0) == 0:
mvc_dict['抵押权人姓名/名称'].append(
register_info.get('details', {}).get('name', {}).get('words', ''))
......
......@@ -219,12 +219,14 @@ class Command(BaseCommand, LoggerMixin):
if mvc_page == 'VehicleRegArea':
mvc_dict['姓名/名称'] = []
mvc_dict['身份证明名称/号码'] = []
mvc_dict['转入地车辆管理所名称'] = []
mvc_dict['转移登记日期'] = []
mvc_dict['抵押权人姓名/名称'] = []
mvc_dict['抵押身份证明名称/号码'] = []
mvc_dict['抵押登记日期'] = []
mvc_dict['解除抵押日期'] = []
mvc_res = mvc_dict.pop('results', {})
mvc_dict['机动车登记证书编号'] = mvc_res.get('register_no', {}).get('words', '')
for register_info in mvc_res.get('register_info', []):
if register_info.get('register_type', 0) == 2:
mvc_dict['姓名/名称'].append(
......@@ -233,6 +235,8 @@ class Command(BaseCommand, LoggerMixin):
register_info.get('details', {}).get('idno', {}).get('words', ''))
mvc_dict['转移登记日期'].append(
register_info.get('details', {}).get('date', {}).get('words', ''))
mvc_dict['转入地车辆管理所名称'].append(
register_info.get('details', {}).get('office_name', {}).get('words', ''))
elif register_info.get('register_type', 0) == 0:
mvc_dict['抵押权人姓名/名称'].append(
register_info.get('details', {}).get('name', {}).get('words', ''))
......@@ -331,7 +335,7 @@ class Command(BaseCommand, LoggerMixin):
ic_merge = False
rp_merge = False
for classify in (consts.IC_CLASSIFY, consts.MVI_CLASSIFY):
for classify in (consts.IC_CLASSIFY, consts.MVI_CLASSIFY, consts.MVC_CLASSIFY):
license_list = license_summary.get(classify)
......@@ -388,8 +392,20 @@ class Command(BaseCommand, LoggerMixin):
price = round(price_total * 100 / (rate + 100), 2)
license_dict['不含税价(逻辑计算)'] = price
return ic_merge, rp_merge
if classify == consts.MVC_CLASSIFY: # 机动车登记证先1/2页,后3/4页
key, _, _ = consts.FIELD_ORDER_MAP.get(classify)
page_1_2 = []
page_3_4 = []
for license_dict in license_list:
if key in license_dict:
page_3_4.append(license_dict)
else:
page_1_2.append(license_dict)
page_1_2.extend(page_3_4)
license_summary[classify] = page_1_2
page_1_2 = page_3_4 = None
return ic_merge, rp_merge
def parse_img_path(self, img_path):
img_name, _ = os.path.splitext(os.path.basename(img_path))
......
import pyodbc
hil_sql = """
"""
afc_sql = """
"""
hil_cnxn = pyodbc.connect('DRIVER={ODBC Driver 17 for SQL Server};', autocommit=True)
hil_cursor = hil_cnxn.cursor()
hil_cursor.execute(hil_sql)
hil_cursor.close()
hil_cnxn.close()
afc_cnxn = pyodbc.connect('DRIVER={ODBC Driver 17 for SQL Server};', autocommit=True)
afc_cursor = afc_cnxn.cursor()
afc_cursor.execute(afc_sql)
afc_cursor.close()
afc_cnxn.close()
import pyodbc
hil_sql = """
create table hil_comparison_info
(
id bigint identity primary key,
uniq_seq nvarchar(128) not null,
application_id nvarchar(64) not null,
customer_type nvarchar(16) not null,
application_version tinyint default 0 not null,
vehicle_status nvarchar(16) not null,
individual_cus_info nvarchar(max) not null,
usedcar_info nvarchar(max),
corporate_cus_info nvarchar(max),
update_time datetime not null,
create_time datetime not null
);
create index hil_comparison_info_application_id_index
on hil_comparison_info (application_id);
create index hil_comparison_info_create_time_index
on hil_comparison_info (create_time);
create index hil_comparison_info_uniq_seq_index
on hil_comparison_info (uniq_seq);
create table hil_ocr_result
(
id int identity primary key,
application_id nvarchar(64) not null,
bs_ocr nvarchar(max),
mvi_ocr nvarchar(max),
ic_ocr nvarchar(max),
rp_ocr nvarchar(max),
bc_ocr nvarchar(max),
bl_ocr nvarchar(max),
uci_ocr nvarchar(max),
eep_ocr nvarchar(max),
dl_ocr nvarchar(max),
pp_ocr nvarchar(max),
mvc_ocr nvarchar(max),
vat_ocr nvarchar(max),
update_time datetime not null,
create_time datetime not null
);
create unique index hil_ocr_result_application_id_uindex
on hil_ocr_result (application_id);
"""
afc_sql = """
create table afc_comparison_info
(
id bigint identity primary key,
uniq_seq nvarchar(128) not null,
application_id nvarchar(64) not null,
customer_type nvarchar(16) not null,
application_version tinyint default 0 not null,
vehicle_status nvarchar(16) not null,
individual_cus_info nvarchar(max) not null,
usedcar_info nvarchar(max),
corporate_cus_info nvarchar(max),
update_time datetime not null,
create_time datetime not null
);
create index afc_comparison_info_application_id_index
on afc_comparison_info (application_id);
create index afc_comparison_info_create_time_index
on afc_comparison_info (create_time);
create index afc_comparison_info_uniq_seq_index
on afc_comparison_info (uniq_seq);
create table afc_ocr_result
(
id int identity primary key,
application_id nvarchar(64) not null,
bs_ocr nvarchar(max),
mvi_ocr nvarchar(max),
ic_ocr nvarchar(max),
rp_ocr nvarchar(max),
bc_ocr nvarchar(max),
bl_ocr nvarchar(max),
uci_ocr nvarchar(max),
eep_ocr nvarchar(max),
dl_ocr nvarchar(max),
pp_ocr nvarchar(max),
mvc_ocr nvarchar(max),
vat_ocr nvarchar(max),
update_time datetime not null,
create_time datetime not null
);
create unique index afc_ocr_result_application_id_uindex
on afc_ocr_result (application_id);
"""
hil_cnxn = pyodbc.connect('DRIVER={ODBC Driver 17 for SQL Server};', autocommit=True)
hil_cursor = hil_cnxn.cursor()
hil_cursor.execute(hil_sql)
hil_cursor.close()
hil_cnxn.close()
afc_cnxn = pyodbc.connect('DRIVER={ODBC Driver 17 for SQL Server};', autocommit=True)
afc_cursor = afc_cnxn.cursor()
afc_cursor.execute(afc_sql)
afc_cursor.close()
afc_cnxn.close()
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!