代码提交

liusheng

2024-02-29 90c52bfb0f6f1092917277c6aeb0b00e428d0c47

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

@@ -537,8 +537,8 @@
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
//                    serviceFundService.addFundSharedInfo(serviceFund.getId());
                    serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
                    serviceFund.setFlowlevel(100L);
                    serviceFund.setRecordstatus(99);
                    serviceFund.setUploadStates(1);
                    serviceFundService.updateById(serviceFund);

                    //保存审批流程表
@@ -598,12 +598,13 @@
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceFund.setOfficedirector(user.getNickName());
                serviceFund.setUploadStates(2);
            }
            System.out.println("serviceFund的值是--------:" + serviceFund);
            log.info("开始更新的的值是--------");
            ServiceFund updateServiceFund = new ServiceFund();
            updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
            updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
//            ServiceFund updateServiceFund = new ServiceFund();
//            updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
//            updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());

            Boolean aBoolean1 = serviceFundService.updateById(serviceFund);
            log.info("integer更新的的值是-------- :{}", aBoolean1);
@@ -646,22 +647,19 @@
    @Log(title = "费用上报", businessType = BusinessType.UPDATE)
    @PostMapping("/fundEdit")
    @RepeatSubmit
    public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
    public AjaxResult fundEdit(@RequestBody ServiceFundVO serviceFundVO) {
        ServiceFund serviceFund = DtoConversionUtils.sourceToTarget(serviceFundVO, ServiceFund.class);
        log.info("修改费用申请入参:{}", serviceFund);
        List<ServiceFund> infoByInfoIdList = serviceFundService.queryInfoById(serviceFund);
        log.info("修改费用申请，通过入参查询 serviceFundService.queryInfoById数据为空,入参:{}", infoByInfoIdList.size());
        if (CollectionUtils.isEmpty(infoByInfoIdList)) {
            return toAjax(false);
            Long id = serviceFundService.addOrUpdateNew(serviceFundVO);
            serviceFund.setId(id);
        }

        Long flowLavel = null;

        LoginUser loginUser = getLoginUser();
//        SysUser user = loginUser.getUser();
//        //查询当前用户的组长
//        SysDept sysDept = new SysDept();
//        sysDept.setDeptId(loginUser.getDeptId());
//        List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDept);

        //查询必审人
        ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();