修改插入分享表的时机

liusheng

2023-05-17 d9dd857a70467c00feaeb25101eb5e2996e95d94

修改插入分享表的时机

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

@@ -496,7 +496,7 @@
    public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
        ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
        if (serviceReimbursement != null) {
            Integer TotalLevel = 0;
            Integer totalLevel = 0;
            LoginUser loginUser = getLoginUser();
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setFundtype(1);
@@ -513,7 +513,9 @@
            }

            if (serviceFundflowrules != null && serviceFundflowrules.stream().count() > 0) {
                TotalLevel = serviceFundflowrules.get(0).getTotallevel();
                totalLevel = serviceFundflowrules.get(0).getTotallevel();


            }
            Integer CheckFlag = 0;
            Integer RecordStatus = serviceReimbursement.getRecordstatus();
@@ -521,10 +523,11 @@
            Integer OriginalFlowLevel = FlowLevel;
            if (checkFundVO.getFlowconclusion() == 1) {
                CheckFlag = 1;
                if (TotalLevel == 0) {
                if (totalLevel == 0) {
                    //99 取消
                    RecordStatus = 99;
                } else {
                    if (TotalLevel == FlowLevel + 1) {
                    if (totalLevel == FlowLevel + 1) {
                        RecordStatus = 99;
                    } else {
                        RecordStatus = (FlowLevel + 1) * 2;
@@ -590,7 +593,10 @@
                //通过
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已通过" + (OriginalFlowLevel + 1) + "级审核");

                if (totalLevel == OriginalFlowLevel + 1) {
                    //所有数据新增到备份表
                    this.addSharedData(checkFundVO.getFundid());
                }
            } else {
                //驳回
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核驳回");
@@ -730,9 +736,7 @@
            BigDecimal keyOneMoney = new BigDecimal(0.00);
            BigDecimal keyTwoMoney = new BigDecimal(0.00);
            for (ServiceReimbursementEo serviceReimbursementEo1 : values) {
                otherMoney = otherMoney.add(serviceReimbursementEo1.getTrafficexpense()).add(serviceReimbursementEo1.getHotelexpense())
                        .add(serviceReimbursementEo1.getFoodexpenses()).add(serviceReimbursementEo1.getFoodallowance())
                        .add(serviceReimbursementEo1.getOtherexpense()).add(serviceReimbursementEo1.getOtherfeeamount());
                otherMoney = otherMoney.add(serviceReimbursementEo1.getTrafficexpense()).add(serviceReimbursementEo1.getHotelexpense()).add(serviceReimbursementEo1.getFoodexpenses()).add(serviceReimbursementEo1.getFoodallowance()).add(serviceReimbursementEo1.getOtherexpense()).add(serviceReimbursementEo1.getOtherfeeamount());
            }
            map.put(key, otherMoney);
            list.add(map);
@@ -1014,9 +1018,7 @@
        }

        result = result.replaceAll("零仟", "零").replaceAll("零佰", "零")        //把单位'亿','万','元'放到最后替换。
                .replaceAll("零拾", "零").replaceAll("零零", "零")
                .replaceAll("零零", "零").replaceAll("零亿", "亿")
                .replaceAll("零万", "万").replaceAll("零元", "元");
                .replaceAll("零拾", "零").replaceAll("零零", "零").replaceAll("零零", "零").replaceAll("零亿", "亿").replaceAll("零万", "万").replaceAll("零元", "元");
        //        result = result.replaceAll("零仟", "零");
        //        result = result.replaceAll("零佰", "零");
        //        result = result.replaceAll("零拾", "零");