fix

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/costplan/CostPlanNewController.java

@@ -103,35 +103,30 @@ public class CostPlanNewController {
     }
 
     @PostMapping("/changeDic")
-    public Map<String, Object> changeDic(HttpServletResponse response, HttpServletRequest request) {
+    public Map<String, Object> changeDic(HttpServletResponse response,
+                                         HttpServletRequest request) {
         Map<String, Object> result = new HashMap<>();
+
         String fromDic = request.getParameter("fromDic");
-        String payCounteractStr = request.getParameter("payCounteract");
-        payCounteractStr = payCounteractStr.replace(" ", "");
-        BigDecimal payCounteract = null;
+        String toDic = request.getParameter("toDic");
+
+        String payCounteractStr = request.getParameter("payCounteract").replace(" ", "");
+        String payLendBalanceStr = request.getParameter("payLendBalance").replace(" ", "");
+
+        BigDecimal payCounteract;
         if (!payCounteractStr.isEmpty()) {
             payCounteract = new BigDecimal(payCounteractStr);
         } else {
-//            result.put("success",false);
-//            result.put("msg","请输入合法的冲销金额");
-//            return result;
             payCounteract = new BigDecimal(0);
         }
-        String payLendBalanceStr = request.getParameter("payLendBalance");
-        payLendBalanceStr = payLendBalanceStr.replace(" ", "");
-        BigDecimal payLendBalance = null;
+        BigDecimal payLendBalance;
         if (!payLendBalanceStr.isEmpty()) {
             payLendBalance = new BigDecimal(payLendBalanceStr);
         } else {
-//            result.put("success",false);
-//            result.put("msg","请输入合法的余额");
-//            return result;
             payLendBalance = new BigDecimal(0);
         }
 
 
-        String toDic = request.getParameter("toDic");
-
         BigDecimal cur = CurUtils.getCur(fromDic, toDic, getExchangeRateApi);
 
         BigDecimal counteract = payCounteract.multiply(cur);

bailuntec-cost-core/src/main/java/com/blt/other/module/database/model/CostPlanDomain.java

@@ -76,6 +76,7 @@ public class CostPlanDomain {
     private BigDecimal payPlanAmount; // 计划金额 （ 支付币种 ）
     private String payDic; // 支付币种
     private BigDecimal payCur; // 汇率
+
     private Integer isTax; // 0 不抵扣个税  1 抵扣个税
     private Integer companyValue; // 公司主体value