pos 3045 update

@@ -4,7 +4,7 @@ from webargs import fields, validate
 from apps.doc.views import CustomDecimal, CustomDate
 from apps.doc.views import CustomDecimal, CustomDate
 from common import response
 from common import response
 from apps.doc.models import HILSEOCRResult, HILOCRResult, AFCSEOCRResult, AFCOCRResult
 from apps.doc.models import HILSEOCRResult, HILOCRResult, AFCSEOCRResult, AFCOCRResult
-from apps.doc import consts
+from prese import consts
 
 
 params = {
 params = {
     'invoiceCode': fields.Str(required=True, validate=validate.Length(max=128)),
     'invoiceCode': fields.Str(required=True, validate=validate.Length(max=128)),
@@ -14,11 +14,11 @@ params = {
     "buyerId": fields.Int(required=True),
     "buyerId": fields.Int(required=True),
     'vin': fields.Str(required=True, validate=validate.Length(max=128)),
     'vin': fields.Str(required=True, validate=validate.Length(max=128)),
     'dealer': fields.Str(required=False, validate=validate.Length(max=64)),
     'dealer': fields.Str(required=False, validate=validate.Length(max=64)),
-    'priceWithVat': CustomDecimal(required=False),
+    'priceWithVat': CustomDecimal(required=True),
     'priceNoVat': CustomDecimal(required=True),
     'priceNoVat': CustomDecimal(required=True),
     'priceInCapitals': fields.Str(required=False),
     'priceInCapitals': fields.Str(required=False),
     'vat': CustomDecimal(required=True),
     'vat': CustomDecimal(required=True),
-    'vatRate': CustomDecimal(required=True),
+    'vatRate': CustomDecimal(required=False),
 }
 }
 
 
 input_args = {
 input_args = {
@@ -75,19 +75,31 @@ class DeMortgageView(GenericView):
             *consts.CA_ADD_COMPARE_FIELDS_PRE).first()
             *consts.CA_ADD_COMPARE_FIELDS_PRE).first()
         ocr_res_dict = result_class.objects.filter(application_id=application_id).values(
         ocr_res_dict = result_class.objects.filter(application_id=application_id).values(
             *consts.PRE_COMPARE_FIELDS).first()
             *consts.PRE_COMPARE_FIELDS).first()
-        if ocr_res_dict is None:
-            return get_empty_result()
+        # if ocr_res_dict is None:
+        #     return get_empty_result()
 
 
-        id_res_list = []
-        for field_name in consts.CA_ADD_COMPARE_FIELDS_PRE:
-            if field_name == consts.IC_OCR_FIELD:
-                id_res_list.append(ca_ocr_res_dict.get(field_name) if isinstance(ca_ocr_res_dict, dict) else None)
-                id_res_list.append(ocr_res_dict.get(field_name))
+        ic_res_list = []
+        ic_res_list.append(ca_ocr_res_dict.get(consts.IC_OCR_FIELD) if isinstance(ca_ocr_res_dict, dict) else None)
+        ic_res_list.append(ocr_res_dict.get(consts.IC_OCR_FIELD) if isinstance(ca_ocr_res_dict, dict) else None)
+
+        field_name, compare_logic, args, comment = consts.ID_COMPARE_LOGIC.get(consts.ID_FIELDS[0])
+        for ic_res in ic_res_list:
+            if ic_res:
+                value = ic_res.get(field_name, '')
+                compare_logic
 
 
         result = {
         result = {
             "is_pass": True,
             "is_pass": True,
-            "customer_name": True,
-            "application_entity": True,
-            "de_mortgage_date": True
+            "fields": [{
+                "name": "",
+                "input": "张三",
+                "ocr": "张三",
+                "field_is_pass": True,
+                "comments": "身份证姓名与系统不一致"
+            }]
+           # "customer_name": True,
+           # "application_entity": True,
+           # "de_mortgage_date": True
         }
         }
         return response.ok(data=result)
         return response.ok(data=result)
+