功能修改

liusheng

2023-07-26 6e2e56de2850204f51642ee3f3b4aff2b04af87c

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

@@ -773,18 +773,30 @@
                    FYXM1.delete(0, FYXM1.length());
                    //再新增
                    otherMoneyall = otherMoneyall.add(otherMoney);
                    FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " ");
                    FYXM1.append("OP0 工作人员报销差旅费" + ":" + otherMoneyall + " ");
                } else {
                    if (flag == 0) {
                        key1 = key;
                        flag = 1;
                    }
                    if (key1 == key) {
                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                        if (key.equals("3")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM2.append("专家报销差旅费 :" + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    } else {
                        FYXM3.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM2.append("家属报销差旅费及误工费用 : " + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                        }
                    } else {
                        if (key.equals("3")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM3.append("专家报销差旅费 :" + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        } else {
                            FYXM3.append("家属报销差旅费及误工费用 : " + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        }
                    }
                }
            } else {
@@ -793,19 +805,31 @@
                    FYXM1.delete(0, FYXM1.length());
                    //再新增
                    otherMoneyall = otherMoneyall.add(otherMoney);
                    FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " ");
                    FYXM1.append("OP0 工作人员报销差旅费" + ":" + otherMoneyall + " ");
                } else {
                    if (flag == 0) {
                        key1 = key;
                        flag = 1;
                    }
                    if (key1 == key) {
                        FYXM2.append(key + ":" + otherMoney);
                        if (key.equals("专家")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM2.append("专家报销差旅费 :" + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    } else {
                        FYXM3.append(key + ":" + otherMoney);
                            FYXM2.append("家属报销差旅费及误工费用 : " + otherMoney);
                        allMoney = allMoney.add(otherMoney);
                    }
                    } else {
                        if (key.equals("专家")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM3.append("专家报销差旅费 :" + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        } else {
                            FYXM3.append("家属报销差旅费及误工费用 : " + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        }
                    }
                }
            }
        }