personType是汉字，判断出现问题

liusheng

2023-07-25 5080514879104891d3c9e41387eb6fd83290310e

personType是汉字，判断出现问题

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -36,6 +36,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;


@@ -763,24 +764,48 @@
            }
            map.put(key, otherMoney);
            list.add(map);
            // 不为专家或家属
            if (!key.equals("3") && !key.equals("4")) {
                //将上一次的清空
                FYXM1.delete(0, FYXM1.length());
                //再新增
                otherMoneyall = otherMoneyall.add(otherMoney);
                FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " ");
            } else {
                if (flag == 0) {
                    key1 = key;
                    flag = 1;
                }
                if (key1 == key) {
                    FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                    allMoney = allMoney.add(otherMoney);
            // 不为专家或家属，key有可能是数字，有可能是汉字
            Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
            boolean matches = pattern.matcher(key).matches();
            if (matches) {
                if (!key.equals("3") && !key.equals("4")) {
                    //将上一次的清空
                    FYXM1.delete(0, FYXM1.length());
                    //再新增
                    otherMoneyall = otherMoneyall.add(otherMoney);
                    FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " ");
                } else {
                    FYXM3.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                    allMoney = allMoney.add(otherMoney);
                    if (flag == 0) {
                        key1 = key;
                        flag = 1;
                    }
                    if (key1 == key) {
                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    } else {
                        FYXM3.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    }
                }
            } else {
                if (!key.equals("专家") && !key.equals("家属")) {
                    //将上一次的清空
                    FYXM1.delete(0, FYXM1.length());
                    //再新增
                    otherMoneyall = otherMoneyall.add(otherMoney);
                    FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " ");
                } else {
                    if (flag == 0) {
                        key1 = key;
                        flag = 1;
                    }
                    if (key1 == key) {
                        FYXM2.append(key + ":" + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    } else {
                        FYXM3.append(key + ":" + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    }
                }
            }
        }