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(0); serviceFundService.updateById(serviceFund); //保存审批流程表 @@ -646,22 +646,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(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -273,7 +273,7 @@ return success(); } else if (serviceReimbursement.getBackflowlevel() >= Long.valueOf(serviceFundflowrules.get(0).getFlowlevel())) { //聂科退回的，也需要走出纳那里 //必审人领导退回的，也需要走必审人那里 serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1)); serviceReimbursement.setRecordstatus(2); serviceReimbursementService.updateById(serviceReimbursement); @@ -384,9 +384,9 @@ //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增 // serviceReimbursementService.addSharedData(serviceReimbursement.getId()); serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getTotallevel())); serviceReimbursement.setFlowlevel(100L); serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceReimbursement.setRecordstatus(99); serviceReimbursement.setUploadStates(0); boolean b = serviceReimbursementService.updateById(serviceReimbursement); log.info("是否修改成功:{}", b);
@@ -106,6 +106,9 @@ if (StringUtils.isNotBlank(serviceReimbursement.getUploadflag())) { wrappers.eq(ServiceReimbursement::getUploadflag, serviceReimbursement.getUploadflag()); } if (serviceReimbursement.getFlowlevel() != null) { wrappers.eq(ServiceReimbursement::getFlowlevel, serviceReimbursement.getFlowlevel()); } /* if (serviceReimbursement.getStarttime()!=null && serviceReimbursement.getEndtime()!=null){ wrappers.between(ServiceReimbursement::getCreateTime ,serviceReimbursement.getStarttime(),serviceReimbursement.getEndtime()); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -78,7 +78,7 @@ ServiceFund serviceFund = new ServiceFund(); serviceFund.setId(serviceFundShared.getSerfunid()); List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund); List<ServiceFund> serviceFunds = serviceFundService.queryInfoById(serviceFund); ServiceFund serviceFund1 = serviceFunds.get(0); serviceFund1.setFlowlevel(100L); serviceFund1.setDel_flag(0);
