Преглед на файлове

Merge remote-tracking branch 'origin/test' into test

haoyu преди 2 години
родител
ревизия
d49134253c
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      src/main/resources/mapper/modules/inv/InvReceivableMapper.xml
  2. 2 2
      src/main/resources/mapper/modules/inv/InvSourceMapper.xml

+ 1 - 1
src/main/resources/mapper/modules/inv/InvReceivableMapper.xml

@@ -287,7 +287,7 @@
         iss.settlement_amount,
         CASE
 
-        WHEN DATEDIFF( NOW(), signing_time ) > 90 THEN
+        WHEN DATEDIFF( NOW(), signing_time ) > 90 AND clearing_state = 0 THEN
         2 ELSE ivs.clearing_state
         END AS clearing_state,
         insurance_clearing_state

+ 2 - 2
src/main/resources/mapper/modules/inv/InvSourceMapper.xml

@@ -132,7 +132,7 @@
         update_name,
         update_userid,
         inv_source_type,
-        CASE WHEN DATEDIFF(NOW(), signing_time) > 90 THEN 2 ELSE inv_source.clearing_state END as clearing_state,
+        CASE WHEN DATEDIFF(NOW(), signing_time) > 90 AND clearing_state = 0 THEN 2 ELSE inv_source.clearing_state END as clearing_state,
         insurance_clearing_state
         from inv_source
         ) a
@@ -250,7 +250,7 @@
         update_name,
         update_userid,
         inv_source_type,
-        CASE WHEN DATEDIFF(NOW(), signing_time) > 90 THEN 2 ELSE inv_source.clearing_state END as clearing_state,
+        CASE WHEN DATEDIFF(NOW(), signing_time) > 90 AND clearing_state = 0 THEN 2 ELSE inv_source.clearing_state END as clearing_state,
         insurance_clearing_state
         from inv_source
         ) a