代码提交

liusheng

2023-10-18 a54e249f9fedf3633825dd7a6846621df7b110b9

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

@@ -128,6 +128,7 @@
        Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
        Integer pageNum = spFinancialExpensesIn.getPageNum();
        Integer pageSize = spFinancialExpensesIn.getPageSize();
        Integer checkstatus = spFinancialExpensesIn.getCheckstatus();

        if (pageNum == null) {
            pageNum = 1;
@@ -150,7 +151,7 @@
        }

        //startPage();
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus);
        //通过捐献者过滤
        if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
            list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
@@ -545,8 +546,6 @@
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceFund.setOfficedirector(user.getNickName());
                String bh = baseOnlyvalueService.getOnlyCode("fund");
                serviceFund.setBh(bh);
            }
            serviceFundService.updateById(serviceFund);

@@ -2005,4 +2004,17 @@

    }


    /**
     * 绩效计算
     */
    @ApiOperation("绩效计算")
    @Log(title = "绩效计算", businessType = BusinessType.INSERT)
    @PostMapping("/performance")
    @RepeatSubmit
    public AjaxResult performance(@RequestBody ServiceFundVO serviceFundVO) {

        return AjaxResult.success(serviceFundService.performance(serviceFundVO));
    }

}