ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -535,39 +535,6 @@ serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "提交的关于捐献案例【" + serviceFund.getDonorname() + "】的费用申请已通过" + (OriginalFlowLevel + 1) + "级审核"); if (TotalLevel == OriginalFlowLevel + 1) { serviceFundService.addFundSharedInfo(checkFundVO.getFundid()); // ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class); // serviceFundShared.setId(null); // serviceFundShared.setSerfunid(serviceFund.getId()); // serviceFundShared.setAmountrequested(new BigDecimal(serviceFund.getAmountrequested())); // serviceFundShared.setPrepaidamount(new BigDecimal(serviceFund.getPrepaidamount())); // serviceFundShared.setTotalcost(new BigDecimal(serviceFund.getTotalcost())); // serviceFundShared.setProcurementcost(new BigDecimal(serviceFund.getProcurementcost())); // serviceFundShared.setExpertcost(new BigDecimal(serviceFund.getExpertcost())); // serviceFundShared.setEthicscost(new BigDecimal(serviceFund.getEthicscost())); // serviceFundShared.setMedicalcost(new BigDecimal(serviceFund.getMedicalcost())); // serviceFundShared.setFamilycost(new BigDecimal(serviceFund.getFamilycost())); // serviceFundShared.setAftercarecost(new BigDecimal(serviceFund.getAftercarecost())); // fundSharedService.save(serviceFundShared); // // Map<String, Object> columnMap = new HashMap<>(); // columnMap.put("fundID", checkFundVO.getFundid()); // //获取详情数据 // List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap); // logger.info("serviceFundController---checkFund的返回值serviceFunddetails :{}", serviceFunddetails); // List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class); // for (int i = 0; i < serviceFunddetails.size(); i++) { // serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId()); // serviceFunddetailShareds.get(i).setFdid(serviceFunddetails.get(i).getId()); // serviceFunddetailShareds.get(i).setAmount(new BigDecimal(serviceFunddetails.get(i).getAmount())); // serviceFunddetailShareds.get(i).setPrepaidamount(new BigDecimal(serviceFunddetails.get(i).getPrepaidamount())); // serviceFunddetailShareds.get(i).setTaxamount(new BigDecimal(serviceFunddetails.get(i).getTaxamount())); // serviceFunddetailShareds.get(i).setTaxedamount(new BigDecimal(serviceFunddetails.get(i).getTaxedamount())); // serviceFunddetailShareds.get(i).setQuantity(new BigDecimal(serviceFunddetails.get(i).getQuantity())); // serviceFunddetailShareds.get(i).setPrice(new BigDecimal(serviceFunddetails.get(i).getPrice())); // serviceFunddetailShareds.get(i).setId(null); // } // funddetailSharedService.saveBatch(serviceFunddetailShareds); } } else { @@ -599,23 +566,20 @@ } for (ServiceFund sf : infoByInfoIdList) { //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了 if (sf.getBackflowlevel() == 100 || sf.getBackflowlevel() == 199) { ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class); serviceFundShared.setId(null); serviceFundShared.setDel_flag(0); fundSharedService.save(serviceFundShared); if (sf.getBackflowlevel() == 199) { //将fund表的审核状态改成100 sf.setBackflowlevel(100); serviceFundService.updateById(sf); //往分享表里新增 serviceFundService.addFundSharedInfo(serviceFund.getId()); return success(); } else { serviceFund.setFlowlevel(sf.getBackflowlevel()); boolean bret = serviceFundService.updateById(serviceFund); log.info("serviceFundService.updateById返参:{}", bret); // if (bret) { // addReiSharedDatd(serviceFund, 2); // } return toAjax(bret); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -450,20 +450,17 @@ ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid()); //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了; if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) { if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) { //将修改的上报数据 新增一条 ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class); serviceReimbursementShared.setId(null); serviceReimbursementShared.setDelFlag(0L); serviceReimbursementShared.setReimid(serviceReimbursement.getId()); serviceReimbursementSharedService.save(serviceReimbursementShared); // if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) { if (serviceReimbursement.getBackflowlevel() == 199) { //将退回阶段设置成100 serviceReimbursement.setBackflowlevel(100L); serviceReimbursement.setFlowlevel(100L); serviceReimbursement.setRecordstatus(0); serviceReimbursementService.updateById(serviceReimbursement); //将修改的上报数据 新增一条 serviceReimbursementService.addSharedData(checkFundVO.getFundid()); return success(); } } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -247,6 +247,7 @@ //file用的是绝对位置 String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length()); String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload"); System.out.println("filePath + substring是乱码吗: " + filePath + substring); File filetest = new File(filePath + substring); try { log.info("请求第三方的入参strFile : {}, strFUrl : {}", strFile, filePath); ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -163,7 +163,7 @@ <select id="getRDInfoByItem" resultType="com.ruoyi.project.domain.ServiceReimbursementEo"> SELECT a.id as id,a.UserNo as userno,a.FlowLevel as recordstatus,b.persontype as persontype,a.create_time as createTime, createTime,a.managername as managername, a.UserName as username,b.personname as travelers,a.AmountRequested as amountrequested,a.Reason as reason,a.Phone as phone,a.DepositBank as depositbank,a.BankCardNo as bankcardno,a.DonorName as donorname,b.trafficexpense as trafficexpense,b.hotelexpense as hotelexpense,b.FoodExpenses as foodexpenses, b.foodallowance as foodallowance, ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -60,7 +60,7 @@ //查出所有被医院退回的Fund数据 List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList(); for (ServiceFundShared serviceFundShared : serviceFundShareds) { if (StringUtils.isNotBlank(serviceFundShared.getCxrjyj())) { if (serviceFundShared.getOabdzt().equals("已撤销")) { //如果有财务驳回信息说明是退回的 String[] split = serviceFundShared.getCxrjyj().split("&"); String phone = serviceFundShared.getPhone(); @@ -83,14 +83,20 @@ ServiceFund serviceFund = new ServiceFund(); serviceFund.setId(serviceFundShared.getSerfunid()); serviceFund.setZffs(serviceFundShared.getZffs()); if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) { serviceFund.setOpochecker(serviceFundShared.getOpochecker()); } if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) { serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident()); } if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) { serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident()); } if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) { serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector()); } if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) { serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector()); } if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) { serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher()); } serviceFund.setRiqi(serviceFundShared.getRiqi()); boolean b = serviceFundService.updateById(serviceFund); @@ -269,7 +275,7 @@ //查出所有被医院退回的Reimbursement数据 List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList(); for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) { if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) { if (serviceReimbursementShared.getOabdzt().equals("已撤销")) { String phone = serviceReimbursementShared.getPhone(); String[] split = serviceReimbursementShared.getCxrjyj().split("&"); @@ -296,15 +302,22 @@ serviceReimbursement.setId(serviceReimbursementShared.getReimid()); serviceReimbursement.setZffs(serviceReimbursementShared.getZffs()); serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi()); if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) { serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker()); } if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) { serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident()); } if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) { serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident()); } if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) { serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector()); } if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) { serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector()); } if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) { serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher()); } boolean b = serviceReimbursementService.updateById(serviceReimbursement); log.info("更新serviceReimbursement里的zffs表是否成功: {}", b); ServiceFundflow serviceFundflow = new ServiceFundflow();
