Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
45e2bd71 by 周伟奇
Options

result get

1 parent 906f258d
Inline Side-by-side
Showing 3 changed files with 72 additions and 34 deletions
src/apps/doc/models.py
...@@ -585,6 +585,7 @@ class AFCCACompareResult(models.Model): ...@@ -585,6 +585,7 @@ class AFCCACompareResult(models.Model):
585 reason9_count = models.SmallIntegerField(default=0, verbose_name="原因9数目") 585 reason9_count = models.SmallIntegerField(default=0, verbose_name="原因9数目")
586 reason10_count = models.SmallIntegerField(default=0, verbose_name="原因10数目") 586 reason10_count = models.SmallIntegerField(default=0, verbose_name="原因10数目")
587 result = models.TextField(null=True, verbose_name="比对结果") 587 result = models.TextField(null=True, verbose_name="比对结果")
588 version = models.CharField(max_length=8, verbose_name="POS/CMS version")
588 update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间') # 索引 589 update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间') # 索引
589 create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') 590 create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
590 591
......
src/apps/doc/views.py
...@@ -768,41 +768,57 @@ class CompareResultView(GenericView): ...@@ -768,41 +768,57 @@ class CompareResultView(GenericView):
768 result_table = AFCCACompareResult if scheme == consts.COMPARE_DOC_SCHEME_LIST[0] else AFCSECompareResult 768 result_table = AFCCACompareResult if scheme == consts.COMPARE_DOC_SCHEME_LIST[0] else AFCSECompareResult
769 769
770 if result_id is not None: 770 if result_id is not None:
771 result_str_list = result_table.objects.filter(id=result_id).values_list('result', flat=True) 771 result_obj = result_table.objects.filter(id=result_id).first()
772 else: 772 else:
773 result_str_list = result_table.objects.filter(application_id=case_id).values_list('result', flat=True) 773 result_obj = result_table.objects.filter(application_id=case_id).first()
774 774
775 if len(result_str_list) == 0: 775 if result_obj is None:
776 compare_result_list = [] 776 whole_result = ''
777 else: 777 else:
778 compare_result_list = json.loads(result_str_list[0]) 778 whole_result = 'Y' if result_obj.is_finish else 'N'
779
780 compare_result = {
781 'id': 0 if result_obj is None else result_obj.id,
782 'application_id': case_id,
783 'scheme': consts.DOC_SCHEME_LIST[0] if scheme == consts.COMPARE_DOC_SCHEME_LIST[0] else consts.DOC_SCHEME_LIST[1],
784 'whole_result': whole_result,
785 'update_time': '' if result_obj is None else result_obj.update_time.strftime('%Y-%m-%d %H:%M'),
786 'version': '' if result_obj is None else result_obj.version,
787 'result': [] if result_obj is None else json.loads(result_obj.result)
788 }
789
790 return response.ok(data=compare_result)
791
792 # if len(result_str_list) == 0:
793 # compare_result_list = []
794 # else:
795 # compare_result_list = json.loads(result_str_list[0])
796 #
797 # if len(compare_result_list) == 0:
798 # body_html = "<h1>没有比对结果</h1>"
799 # else:
800 # head_content = ''.join(['<th>{0}</th>'.format(head_name) for head_name in consts.HEAD_LIST])
801 # head_html = '<tr>{0}</tr>'.format(head_content)
802 # row_html_list = []
803 # for row_dict in compare_result_list:
804 # row_list = [row_dict.get(head, '') for head in consts.HEAD_LIST]
805 # row_content = ''.join(['<td>{0}</td>'.format(row_str) for row_str in row_list])
806 # row_html = '<tr>{0}</tr>'.format(row_content)
807 # row_html_list.append(row_html)
808 # content_html = ''.join(row_html_list)
809 # body_html = '<table border="1">{0}{1}</table>'.format(head_html, content_html)
810 #
811 # html = """
812 # <!DOCTYPE html>
813 # <html>
814 # <head>
815 # <meta charset="utf-8">
816 # <title>比对结果</title>
817 # </head>
818 # <body>
819 # {0}
820 # </body>
821 # </html>
822 # """.format(body_html)
823 # return HttpResponse(html)
779 824
780 if len(compare_result_list) == 0:
781 body_html = "<h1>没有比对结果</h1>"
782 else:
783 head_content = ''.join(['<th>{0}</th>'.format(head_name) for head_name in consts.HEAD_LIST])
784 head_html = '<tr>{0}</tr>'.format(head_content)
785 row_html_list = []
786 for row_dict in compare_result_list:
787 row_list = [row_dict.get(head, '') for head in consts.HEAD_LIST]
788 row_content = ''.join(['<td>{0}</td>'.format(row_str) for row_str in row_list])
789 row_html = '<tr>{0}</tr>'.format(row_content)
790 row_html_list.append(row_html)
791 content_html = ''.join(row_html_list)
792 body_html = '<table border="1">{0}{1}</table>'.format(head_html, content_html)
793
794 html = """
795 <!DOCTYPE html>
796 <html>
797 <head>
798 <meta charset="utf-8">
799 <title>比对结果</title>
800 </head>
801 <body>
802 {0}
803 </body>
804 </html>
805 """.format(body_html)
806 return HttpResponse(html)
807
808 # return response.ok(data=compare_result)
......
src/common/tools/mssql_script7.py 0 → 100644
1 import pyodbc
2
3 hil_sql = "ALTER TABLE hil_ocr_report ADD notes nvarchar(2048)"
4
5 afc_sql = "ALTER TABLE afc_ocr_report ADD notes nvarchar(2048)"
6
7 hil_cnxn = pyodbc.connect('DRIVER={ODBC Driver 17 for SQL Server};', autocommit=True)
8
9 hil_cursor = hil_cnxn.cursor()
10 hil_cursor.execute(hil_sql)
11
12 hil_cursor.close()
13 hil_cnxn.close()
14
15 afc_cnxn = pyodbc.connect('DRIVER={ODBC Driver 17 for SQL Server};', autocommit=True)
16
17 afc_cursor = afc_cnxn.cursor()
18 afc_cursor.execute(afc_sql)
19
20 afc_cursor.close()
21 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!