liusheng
2023-08-09 2c16ba7f4cdfedf4ec05395e20caf9c87f2b5101
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -601,9 +601,9 @@
                    serviceFundflowAuto.setFlowcontent("非专职人员二级审核拒绝后直接退回到修改状态");
                    serviceFundflowAuto.setFlowlevel(1);
                    serviceFundflowService.save(serviceFundflowAuto);
                    serviceReimbursement.setRecordstatus(1);
                }
            }
            serviceReimbursementService.updateById(serviceReimbursement);
@@ -618,10 +618,12 @@
            serviceSystemmessage.setIsread(0);
            serviceSystemmessage.setMessagetype(1);
            serviceSystemmessage.setRelevantno(serviceReimbursement.getId());
            log.info("CheckFlag的值 : {}", CheckFlag);
            if (CheckFlag == 1) {
                //通过
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                log.info("totalLevel的值 : {},  OriginalFlowLevel的值:{}", totalLevel,OriginalFlowLevel);
                if (totalLevel == OriginalFlowLevel + 1) {
                    //所有数据新增到备份表
                    serviceReimbursementService.addSharedData(checkFundVO.getFundid());
@@ -646,7 +648,7 @@
    @ApiOperation("修改报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
    @Log(title = "报销申请", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/reimbursementEdit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceReimbursement serviceReimbursement) {
        boolean b = serviceReimbursementService.updateById(serviceReimbursement);