Merge branch 'feature/CHINARPA-4660' into feature/uat-tmp

@@ -2179,7 +2179,7 @@ FS_COMPARE_LOGIC = {
 
 
 FSS_COMPARE_LOGIC = {
 FSS_COMPARE_LOGIC = {
     '公司名称': ('title', 'se_company_compare', {}, '财报情况说明公司名称错误'),
     '公司名称': ('title', 'se_company_compare', {}, '财报情况说明公司名称错误'),
-    '公章': ('stamp', 'stamp_dict_compare', {}, '财报情况说明无公章'),
+    '公章': ('stamp', 'stamp_str_compare', {}, '财报情况说明无公章'),
   }
   }
 
 
 AFC_HT_DATE_FIELDS = ['主借人日期', '共借人日期', '保证人日期1', '保证人日期2']
 AFC_HT_DATE_FIELDS = ['主借人日期', '共借人日期', '保证人日期1', '保证人日期2']

@@ -728,6 +728,15 @@ class Comparison:
         except Exception as e:
         except Exception as e:
             return self.RESULT_N
             return self.RESULT_N
 
 
+    def stamp_str_compare(self, input_str, ocr_str, **kwargs):
+        try:
+            if ocr_str != 1:
+                return self.RESULT_N
+            else:
+                return self.RESULT_Y
+        except Exception as e:
+            return self.RESULT_N
+
     def fiscal_year_compare(self, input_str, ocr_list, **kwargs):
     def fiscal_year_compare(self, input_str, ocr_list, **kwargs):
         try:
         try:
             this_year_str = datetime.now().strftime('%Y')
             this_year_str = datetime.now().strftime('%Y')