merge

@@ -4,5 +4,6 @@ from . import views
 
 
 urlpatterns = [
 urlpatterns = [
     path(r'', views.DocView.as_view()),
     path(r'', views.DocView.as_view()),
+    path(r'query/employee', views.EmployeeView.as_view()),
     path(r'contract/v1', views.SEContractView.as_view()),
     path(r'contract/v1', views.SEContractView.as_view()),
 ]
 ]

@@ -1507,7 +1507,7 @@ class Command(BaseCommand, LoggerMixin):
                         # AFC合同
                         # AFC合同
                         if classify_1_str == str(consts.CONTRACT_CLASSIFY):
                         if classify_1_str == str(consts.CONTRACT_CLASSIFY):
                             is_fsm = doc.is_ovp_fsm == 1
                             is_fsm = doc.is_ovp_fsm == 1
-                            ocr_result = afc_predict(self,pdf_handler.pdf_info, is_fsm=is_fsm)
+                            ocr_result = afc_predict(pdf_handler.pdf_info, is_fsm=is_fsm)
                             page_res = {}
                             page_res = {}
                             for page_num, page_info in ocr_result.get('page_info', {}).items():
                             for page_num, page_info in ocr_result.get('page_info', {}).items():
                                 if isinstance(page_num, str) and page_num.startswith('page_'):
                                 if isinstance(page_num, str) and page_num.startswith('page_'):

@@ -92,6 +92,10 @@ class CustomDecimal(fields.Decimal):
 def load_data(request, schema):
 def load_data(request, schema):
     return request.data
     return request.data
 
 
+employee_args = {
+    'applicationId': fields.Str(required=True, validate=validate.Length(max=64)),
+    'business_type': fields.Str(required=True, validate=validate.Length(max=64)),
+}
 
 
 go_args = {
 go_args = {
     'image': fields.Raw(required=True),
     'image': fields.Raw(required=True),
@@ -1890,3 +1894,24 @@ def notifyCmsPass(self, request):
     else:
     else:
         self.running_log.info('[pressure cms success] [response={0}]'.format(response))
         self.running_log.info('[pressure cms success] [response={0}]'.format(response))
     return True
     return True
+class EmployeeView(GenericView):
+    permission_classes = [IsAuthenticated]
+    authentication_classes = [OAuth2AuthenticationWithUser]
+
+    @use_args(employee_args, location='data')
+    def post(self, request, args): 
+        
+        application_id = args.get('application_id')
+        business_type = args.get('business_type')
+        
+        ocr_result_class = HILOCRResult if business_type in consts.HIL_SET else AFCOCRResult
+        ocr_result_info = ocr_result_class.objects.filter(application_id=application_id).first()
+        if not ocr_result_info:
+            return response.ok(data=False)
+        bss_ocr_str = ocr_result_info.bss_ocr
+        bss_ocr = json.loads(bss_ocr_str)
+        for one_bss in bss_ocr:
+            income_keywords = one_bss['income_keywords']
+            if income_keywords is not None and len(income_keywords) > 0:
+                return response.ok(data=True)
+        return response.ok(data=False)
\ No newline at end of file

@@ -24,7 +24,7 @@ def extract_info(ocr_results):
     return {'page_1': {'合同编号': contract_no}}
     return {'page_1': {'合同编号': contract_no}}
 
 
 
 
-def predict(self, pdf_info, is_qrs=False, is_fsm=False):
+def predict(pdf_info, is_qrs=False, is_fsm=False):
     pop_seceond_page_info = {}
     pop_seceond_page_info = {}
     if not is_fsm and not is_qrs and len(pdf_info) == 9:
     if not is_fsm and not is_qrs and len(pdf_info) == 9:
         pop_seceond_page_info = pdf_info.pop('1', {})
         pop_seceond_page_info = pdf_info.pop('1', {})
@@ -61,10 +61,8 @@ def predict(self, pdf_info, is_qrs=False, is_fsm=False):
     else:
     else:
         # 输入是整个 PDF 中的信息
         # 输入是整个 PDF 中的信息
         if is_fsm:
         if is_fsm:
-            self.online_log.info('afc_contract_is_fsm')
             f = FSMFinder(pdf_info, ocr_results=ocr_results) 
             f = FSMFinder(pdf_info, ocr_results=ocr_results) 
         else:
         else:
-            self.online_log.info('afc_contract_is_non_fsm')
             f = Finder(pdf_info, ocr_results=ocr_results)
             f = Finder(pdf_info, ocr_results=ocr_results)
         results = f.get_info()
         results = f.get_info()
     return results
     return results