MOD:财年和非零比对逻辑

@@ -705,7 +705,7 @@ class Comparison:
             this_year_str = datetime.now().strftime('%Y')
             this_year_str = datetime.now().strftime('%Y')
             this_year = int(this_year_str)
             this_year = int(this_year_str)
             last_year = this_year - 1
             last_year = this_year - 1
-            if input_str != this_year and input_str != last_year:
+            if str(input_str) != str(this_year) and str(input_str) != str(last_year):
                  return self.RESULT_N
                  return self.RESULT_N
             return self.RESULT_Y
             return self.RESULT_Y
         except Exception as e:
         except Exception as e:
@@ -714,7 +714,7 @@ class Comparison:
     def input_list_not_zero_compare(self, input_list, ocr_list, **kwargs):
     def input_list_not_zero_compare(self, input_list, ocr_list, **kwargs):
         try:
         try:
             for item in input_list:
             for item in input_list:
-                if item == 0:
+                if float(item) <= 0:
                     return self.RESULT_N
                     return self.RESULT_N
             return self.RESULT_Y
             return self.RESULT_Y
         except Exception as e:
         except Exception as e: