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

38745fe5 · zhkwei · 20ec568d · f203dbd1 · 38745fe5
Commit 38745fe5 authored Apr 18, 2019 by zhkwei
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

FunctionBase.java .../atms/vat/service/impl/report/functions/FunctionBase.java +5 -1

No files found.
--- a/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FunctionBase.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FunctionBase.java
@@ -257,7 +257,11 @@ public class FunctionBase {
                    else {return new BigDecimal(0);}

                }
-            }else{
+            }else if (evalStr.indexOf("${KeyIn}")>0){
+                if (!dss.isEmpty()) return dss.get(0).getAmount();
+                return new BigDecimal(0);
+            }
+            else{
                try {
                    BigDecimal bigDecimal = new BigDecimal(evalStr);
                    if (!dss.isEmpty()) {