ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -538,7 +538,7 @@ // serviceFundService.addFundSharedInfo(serviceFund.getId()); serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceFund.setRecordstatus(99); serviceFund.setUploadStates(0); serviceFund.setUploadStates(1); serviceFundService.updateById(serviceFund); //保存审批流程表 @@ -598,7 +598,7 @@ //001审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) { serviceFund.setOfficedirector(user.getNickName()); serviceFund.setUploadStates(0); serviceFund.setUploadStates(2); } System.out.println("serviceFund的值是--------:" + serviceFund); log.info("开始更新的的值是--------"); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -233,6 +233,7 @@ if (!Objects.isNull(serviceReimbursement)) { serviceReimbursement.setCreateTime(new Date()); serviceReimbursement.setCheckstatus(serviceReimbursement.getCheckstatus() == null ? 1 : serviceReimbursement.getCheckstatus()); serviceReimbursement.setUploadStates(0); boolean b = serviceReimbursementService.save(serviceReimbursement); Long id = serviceReimbursement.getId(); return AjaxResult.success(id); @@ -402,7 +403,7 @@ serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceReimbursement.setRecordstatus(99); serviceReimbursement.setUploadStates(0); serviceReimbursement.setUploadStates(1); boolean b = serviceReimbursementService.updateById(serviceReimbursement); log.info("是否修改成功:{}", b); @@ -481,7 +482,7 @@ //001审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) { serviceReimbursement.setOfficedirector(user.getNickName()); serviceReimbursement.setUploadStates(0); serviceReimbursement.setUploadStates(1); } serviceReimbursementService.updateById(serviceReimbursement); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -698,6 +698,7 @@ public Long addOrUpdateNew(ServiceFundVO serviceFundVO) { Long id = null; //将数据保存到fund表 serviceFundVO.setUploadStates(0); id = saveFund(serviceFundVO); List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails(); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -602,7 +602,7 @@ log.info("差旅的最高等级:{}", serviceFundflowrules.get(0).getTotallevel()); ServiceReimbursement serviceReimbursement = new ServiceReimbursement(); serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceReimbursement.setUploadStates(0); serviceReimbursement.setUploadStates(1); serviceReimbursement.setDelFlag(0); List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement); for (ServiceReimbursement serviceReimbursement1 : serviceReimbursementList) { @@ -612,7 +612,7 @@ if (aBoolean) { ServiceReimbursement serviceReimbursement3 = new ServiceReimbursement(); serviceReimbursement3.setId(serviceReimbursement1.getId()); serviceReimbursement3.setUploadStates(1); serviceReimbursement3.setUploadStates(2); boolean b = serviceReimbursementService.updateById(serviceReimbursement3); log.info("serviceReimbursement是否插入成功{},{}", aBoolean, b); } @@ -659,7 +659,7 @@ private void addFunfShared(Long totallevel, String applyType) { ServiceFund serviceFund = new ServiceFund(); serviceFund.setFlowlevel(totallevel); serviceFund.setUploadStates(0); serviceFund.setUploadStates(1); serviceFund.setDel_flag(0); serviceFund.setApplytype(applyType); List<ServiceFund> serviceFundList = serviceFundService.queryList(serviceFund); @@ -670,7 +670,7 @@ if (aBoolean) { ServiceFund serviceFund2 = new ServiceFund(); serviceFund2.setId(serviceFund1.getId()); serviceFund2.setUploadStates(1); serviceFund2.setUploadStates(2); boolean b = serviceFundService.updateById(serviceFund2); log.info("serviceReimbursement是否插入成功{},{}", aBoolean, b); }
