From d51868f9949f0324f33a57cf9d3cbbe99465d18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com>
Date: Sat, 7 May 2022 21:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/account/AccountService.java   |  4 +--
 .../java/com/jsh/erp/utils/StringUtil.java    | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java
index 22eadc20..19569ae6 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java
@@ -526,10 +526,10 @@ public class AccountService {
     public String getAccountStrByIdAndMoney(Map<Long,String> accountMap, String accountIdList, String accountMoneyList){
         StringBuffer sb = new StringBuffer();
         List<Long> idList = StringUtil.strToLongList(accountIdList);
-        List<Long> moneyList = StringUtil.strToLongList(accountMoneyList);
+        List<BigDecimal> moneyList = StringUtil.strToBigDecimalList(accountMoneyList);
         for (int i = 0; i < idList.size(); i++) {
             Long id = idList.get(i);
-            BigDecimal money =  BigDecimal.valueOf(moneyList.get(i)).abs();
+            BigDecimal money =  moneyList.get(i).abs();
             sb.append(accountMap.get(id) + "(" + money + "元) ");
         }
         return sb.toString();
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
index bf1cc3fc..e85a1325 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
@@ -4,6 +4,7 @@ import org.springframework.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -177,10 +178,10 @@ public class StringUtil {
         return new ArrayList<String>();
     }
 
-    public static int getArrSum(String[] strings) {
-        int sum = 0;
+    public static BigDecimal getArrSum(String[] strings) {
+        BigDecimal sum = BigDecimal.ZERO;
         for(int i=0;i<strings.length;i++){
-            sum=sum+ Integer.parseInt(strings[i]);
+            sum = sum.add(new BigDecimal(strings[i]));
         }
         return sum;
     }
@@ -203,6 +204,24 @@ public class StringUtil {
         return idList;
     }
 
+    /**
+     * String字符串转成List<BigDecimal>数据格式
+     * String str = "1,2,3,4,5,6" -> List<BigDecimal> listBigDecimal [1,2,3,4,5,6];
+     *
+     * @param strArr
+     * @return
+     */
+    public static List<BigDecimal> strToBigDecimalList(String strArr) {
+        List<BigDecimal> idList=new ArrayList<>();
+        String[] d=strArr.split(",");
+        for (int i = 0, size = d.length; i < size; i++) {
+            if(d[i]!=null) {
+                idList.add(new BigDecimal(d[i]));
+            }
+        }
+        return idList;
+    }
+
     /**
      * String字符串转成List<String>数据格式
      * String str = "1,2,3,4,5,6" -> List<Long> listLong [1,2,3,4,5,6];