ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -213,122 +213,122 @@ } public int addReiSharedDatd(ServiceFund serviceFund, int nType) { //remShare = ; ServiceFundShared remShare = null; if (nType == 1) { remShare = new ServiceFundShared(); remShare.setSerfunid(serviceFund.getId()); } else //modify { List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId()); if (remlist != null) remShare = remlist.get(0); } remShare.setDonorno(serviceFund.getDonorno()); remShare.setDonorname(serviceFund.getDonorname()); remShare.setUserno(serviceFund.getUserno()); remShare.setUsername(serviceFund.getUsername()); remShare.setUnitname(serviceFund.getUnitname()); remShare.setUnitno(serviceFund.getUnitno()); remShare.setUnituserno(serviceFund.getUnituserno()); remShare.setPhone(serviceFund.getPhone()); remShare.setAnnexbankcard(serviceFund.getAnnexbankcard()); remShare.setAnnexregistform(serviceFund.getAnnexregistform()); Double nTemp = serviceFund.getPretaxcost(); if (nTemp == null) nTemp = 0d; remShare.setPretaxcost(BigDecimal.valueOf(nTemp)); //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles()); // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested())); nTemp = serviceFund.getTaxedcost(); if (nTemp == null) nTemp = 0d; remShare.setTaxedcost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getTotalcost(); if (nTemp == null) nTemp = 0d; remShare.setTotalcost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getExpertcost(); if (nTemp == null) nTemp = 0.0; remShare.setExpertcost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getEthicscost(); if (nTemp == null) nTemp = 0.0; remShare.setEthicscost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getMedicalcost(); if (nTemp == null) nTemp = 0.0; remShare.setMedicalcost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getFamilycost(); if (nTemp == null) nTemp = 0.0; remShare.setFamilycost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getAftercarecost(); if (nTemp == null) nTemp = 0.0; remShare.setAftercarecost(BigDecimal.valueOf(nTemp)); nTemp = serviceFund.getAmountrequested(); if (nTemp == null) nTemp = 0.0; remShare.setAmountrequested(BigDecimal.valueOf(nTemp)); remShare.setApplytype(serviceFund.getApplytype()); nTemp = serviceFund.getPrepaidamount(); if (nTemp == null) nTemp = 0.0; remShare.setPrepaidamount(BigDecimal.valueOf(nTemp)); remShare.setInvoicecount(serviceFund.getInvoicecount()); remShare.setAttachcount(serviceFund.getAttachcount()); remShare.setManagerno(serviceFund.getManagerno()); remShare.setManagername(serviceFund.getManagername()); remShare.setDeptmentno(serviceFund.getDeptmentno()); remShare.setDeptmentname(serviceFund.getDeptmentname()); remShare.setOpochecker(serviceFund.getOpochecker()); remShare.setFinvicepresident(serviceFund.getFinvicepresident()); remShare.setBusvicepresident(serviceFund.getBusvicepresident()); remShare.setOfficedirector(serviceFund.getOfficedirector()); remShare.setFinancedirector(serviceFund.getFinancedirector()); remShare.setFinancechecher(serviceFund.getFinancechecher()); //remShare.setIsdistribute(serviceFund.getIsdistribute()); remShare.setRecordstatus(serviceFund.getRecordstatus()); remShare.setUploadflag(serviceFund.getUploadflag()); remShare.setUploadtime(serviceFund.getUploadtime()); long nLevel = serviceFund.getFlowlevel(); remShare.setFlowlevel(nLevel); remShare.setInfoid(serviceFund.getInfoid()); //remShare.setOaid(serviceReimbursement.getOaid()); //remShare.setDonorno(serviceReimbursement.getDonorno()); boolean bRet = false; if (nType == 1) { bRet = fundServiceShare.save(remShare); } else { //remShare.setId(serviceReimbursement.); bRet = fundServiceShare.updateById(remShare); } //if(!bRet) return -1; String strMutfileUrl = remShare.getAnnexbankcard(); //有附件时才调用第三方进行上传 if (strMutfileUrl == null) return 0; if (strMutfileUrl.isEmpty()) return 0; try { uploadOAFileAndUpdateDb(remShare); } catch (Exception e) { logger.error("调用第三方接口出错!"); e.printStackTrace(); } //此处保存成功后要上传OA，保存返回值 return 0; } // public int addReiSharedDatd(ServiceFund serviceFund, int nType) { // //remShare = ; // ServiceFundShared remShare = null; // if (nType == 1) { // remShare = new ServiceFundShared(); // remShare.setSerfunid(serviceFund.getId()); // } else //modify // { // List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId()); // if (remlist != null) remShare = remlist.get(0); // } // // remShare.setDonorno(serviceFund.getDonorno()); // remShare.setDonorname(serviceFund.getDonorname()); // remShare.setUserno(serviceFund.getUserno()); // remShare.setUsername(serviceFund.getUsername()); // remShare.setUnitname(serviceFund.getUnitname()); // remShare.setUnitno(serviceFund.getUnitno()); // remShare.setUnituserno(serviceFund.getUnituserno()); // remShare.setPhone(serviceFund.getPhone()); // remShare.setAnnexbankcard(serviceFund.getAnnexbankcard()); // remShare.setAnnexregistform(serviceFund.getAnnexregistform()); // Double nTemp = serviceFund.getPretaxcost(); // if (nTemp == null) nTemp = 0d; // remShare.setPretaxcost(BigDecimal.valueOf(nTemp)); // //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles()); // // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested())); // // nTemp = serviceFund.getTaxedcost(); // if (nTemp == null) nTemp = 0d; // remShare.setTaxedcost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getTotalcost(); // if (nTemp == null) nTemp = 0d; // remShare.setTotalcost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getExpertcost(); // if (nTemp == null) nTemp = 0.0; // remShare.setExpertcost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getEthicscost(); // if (nTemp == null) nTemp = 0.0; // remShare.setEthicscost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getMedicalcost(); // if (nTemp == null) nTemp = 0.0; // remShare.setMedicalcost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getFamilycost(); // if (nTemp == null) nTemp = 0.0; // remShare.setFamilycost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getAftercarecost(); // if (nTemp == null) nTemp = 0.0; // remShare.setAftercarecost(BigDecimal.valueOf(nTemp)); // // nTemp = serviceFund.getAmountrequested(); // if (nTemp == null) nTemp = 0.0; // remShare.setAmountrequested(BigDecimal.valueOf(nTemp)); // // // remShare.setApplytype(serviceFund.getApplytype()); // // nTemp = serviceFund.getPrepaidamount(); // if (nTemp == null) nTemp = 0.0; // remShare.setPrepaidamount(BigDecimal.valueOf(nTemp)); // // remShare.setInvoicecount(serviceFund.getInvoicecount()); // remShare.setAttachcount(serviceFund.getAttachcount()); // remShare.setManagerno(serviceFund.getManagerno()); // remShare.setManagername(serviceFund.getManagername()); // remShare.setDeptmentno(serviceFund.getDeptmentno()); // remShare.setDeptmentname(serviceFund.getDeptmentname()); // remShare.setOpochecker(serviceFund.getOpochecker()); // remShare.setFinvicepresident(serviceFund.getFinvicepresident()); // remShare.setBusvicepresident(serviceFund.getBusvicepresident()); // remShare.setOfficedirector(serviceFund.getOfficedirector()); // remShare.setFinancedirector(serviceFund.getFinancedirector()); // remShare.setFinancechecher(serviceFund.getFinancechecher()); // //remShare.setIsdistribute(serviceFund.getIsdistribute()); // remShare.setRecordstatus(serviceFund.getRecordstatus()); // remShare.setUploadflag(serviceFund.getUploadflag()); // remShare.setUploadtime(serviceFund.getUploadtime()); // long nLevel = serviceFund.getFlowlevel(); // remShare.setFlowlevel(nLevel); // // remShare.setInfoid(serviceFund.getInfoid()); // // //remShare.setOaid(serviceReimbursement.getOaid()); // //remShare.setDonorno(serviceReimbursement.getDonorno()); // // boolean bRet = false; // if (nType == 1) { // bRet = fundServiceShare.save(remShare); // } else { // //remShare.setId(serviceReimbursement.); // bRet = fundServiceShare.updateById(remShare); // } // // //if(!bRet) return -1; // String strMutfileUrl = remShare.getAnnexbankcard(); // //有附件时才调用第三方进行上传 // if (strMutfileUrl == null) return 0; // if (strMutfileUrl.isEmpty()) return 0; // // try { // uploadOAFileAndUpdateDb(remShare); // } catch (Exception e) { // logger.error("调用第三方接口出错!"); // e.printStackTrace(); // } // // //此处保存成功后要上传OA，保存返回值 // // return 0; // } int uploadOAFileAndUpdateDb(ServiceFundShared remShare) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -195,18 +195,6 @@ } /** * 往service_reimbursement_share,往service_reimbursementdetail_share,往service_reimbursementpyee_share新增备份数据 * * @param id * @return */ @GetMapping("/addShareData/{id}") public AjaxResult addSharedData(@PathVariable("id") Long id) { return AjaxResult.success(serviceReimbursementService.addSharedData(id)); } /** * 新增报销申请 */ @ApiOperation("新增报销申请") @@ -225,106 +213,106 @@ return AjaxResult.success(id); } public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) { //remShare = ; ServiceReimbursementShared remShare = new ServiceReimbursementShared(); if (nType == 1) { // remShare = new ServiceReimbursementShared(); remShare.setReimid(serviceReimbursement.getId()); } else //modify { List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId()); if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0); } remShare.setUserno(serviceReimbursement.getUserno()); remShare.setUsername(serviceReimbursement.getUsername()); remShare.setTravelers(serviceReimbursement.getTravelers()); remShare.setIdcardtype(serviceReimbursement.getIdcardtype()); remShare.setIdcardno(serviceReimbursement.getIdcardno()); remShare.setPhone(serviceReimbursement.getPhone()); remShare.setDepositbank(serviceReimbursement.getDepositbank()); remShare.setBankcardno(serviceReimbursement.getBankcardno()); remShare.setBranchbankname(serviceReimbursement.getBranchbankname()); remShare.setAnnexbankcard(serviceReimbursement.getAnnexbankcard()); remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles()); //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles()); // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested())); Double nTemp = serviceReimbursement.getAmountrequested(); if (nTemp == null) nTemp = 0d; remShare.setAmountrequested(BigDecimal.valueOf(nTemp)); nTemp = serviceReimbursement.getPrepaidamount(); if (nTemp == null) nTemp = 0.0; remShare.setPrepaidamount(BigDecimal.valueOf(nTemp)); remShare.setInvoicecount(serviceReimbursement.getInvoicecount()); remShare.setAttachcount(serviceReimbursement.getAttachcount()); remShare.setManagerno(serviceReimbursement.getManagerno()); remShare.setManagername(serviceReimbursement.getManagername()); remShare.setDeptmentno(serviceReimbursement.getDeptmentno()); remShare.setDeptmentname(serviceReimbursement.getDeptmentname()); remShare.setOpochecker(serviceReimbursement.getOpochecker()); remShare.setFinvicepresident(serviceReimbursement.getFinvicepresident()); remShare.setBusvicepresident(serviceReimbursement.getBusvicepresident()); remShare.setOfficedirector(serviceReimbursement.getOfficedirector()); remShare.setFinancedirector(serviceReimbursement.getFinancedirector()); remShare.setFinancechecher(serviceReimbursement.getFinancechecher()); remShare.setInfoid(serviceReimbursement.getInfoid()); remShare.setDonorno(serviceReimbursement.getDonorno()); remShare.setDonorname(serviceReimbursement.getDonorname()); remShare.setReason(serviceReimbursement.getReason()); remShare.setRecordstatus(serviceReimbursement.getRecordstatus()); remShare.setUploadflag(serviceReimbursement.getUploadflag()); remShare.setUploadtime(serviceReimbursement.getUploadtime()); nTemp = serviceReimbursement.getTotalamount(); if (nTemp == null) nTemp = 0.0; remShare.setTotalamount(BigDecimal.valueOf(nTemp)); remShare.setBigstrmoney(serviceReimbursement.getBigstrmoney()); remShare.setFlowlevel(serviceReimbursement.getFlowlevel()); remShare.setCosttype(serviceReimbursement.getCosttype()); remShare.setCosttypename(serviceReimbursement.getCosttypename()); remShare.setFileurl(serviceReimbursement.getAnnexfiles()); remShare.setDonorbank(serviceReimbursement.getDonorbank()); remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard()); remShare.setDonorremark(serviceReimbursement.getDonorremark()); nTemp = serviceReimbursement.getDonoramount(); if (nTemp == null) nTemp = 0.0; remShare.setDonoramount(nTemp); remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives()); //remShare.setOaid(serviceReimbursement.getOaid()); //remShare.setDonorno(serviceReimbursement.getDonorno()); boolean bRet = false; if (nType == 1) { bRet = serviceReimbursementServiceShare.save(remShare); } else { //remShare.setId(serviceReimbursement.); bRet = serviceReimbursementServiceShare.updateById(remShare); } //if(!bRet) return -1; String strMutfileUrl = remShare.getFileurl(); //有附件时才调用第三方进行上传 if (strMutfileUrl == null) return 0; if (strMutfileUrl.isEmpty()) return 0; try { uploadOAFileAndUpdateDb(remShare); } catch (Exception e) { logger.error("调用第三方接口出错!"); e.printStackTrace(); } //此处保存成功后要上传OA，保存返回值 return 0; } // public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) { // //remShare = ; // ServiceReimbursementShared remShare = new ServiceReimbursementShared(); // if (nType == 1) { // // remShare = new ServiceReimbursementShared(); // remShare.setReimid(serviceReimbursement.getId()); // } else //modify // { // List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId()); // if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0); // } // // remShare.setUserno(serviceReimbursement.getUserno()); // remShare.setUsername(serviceReimbursement.getUsername()); // remShare.setTravelers(serviceReimbursement.getTravelers()); // remShare.setIdcardtype(serviceReimbursement.getIdcardtype()); // remShare.setIdcardno(serviceReimbursement.getIdcardno()); // remShare.setPhone(serviceReimbursement.getPhone()); // remShare.setDepositbank(serviceReimbursement.getDepositbank()); // remShare.setBankcardno(serviceReimbursement.getBankcardno()); // remShare.setBranchbankname(serviceReimbursement.getBranchbankname()); // remShare.setAnnexbankcard(serviceReimbursement.getAnnexbankcard()); // remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles()); // //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles()); // // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested())); // // Double nTemp = serviceReimbursement.getAmountrequested(); // if (nTemp == null) nTemp = 0d; // remShare.setAmountrequested(BigDecimal.valueOf(nTemp)); // // nTemp = serviceReimbursement.getPrepaidamount(); // if (nTemp == null) nTemp = 0.0; // remShare.setPrepaidamount(BigDecimal.valueOf(nTemp)); // // remShare.setInvoicecount(serviceReimbursement.getInvoicecount()); // remShare.setAttachcount(serviceReimbursement.getAttachcount()); // remShare.setManagerno(serviceReimbursement.getManagerno()); // remShare.setManagername(serviceReimbursement.getManagername()); // remShare.setDeptmentno(serviceReimbursement.getDeptmentno()); // remShare.setDeptmentname(serviceReimbursement.getDeptmentname()); // remShare.setOpochecker(serviceReimbursement.getOpochecker()); // remShare.setFinvicepresident(serviceReimbursement.getFinvicepresident()); // remShare.setBusvicepresident(serviceReimbursement.getBusvicepresident()); // remShare.setOfficedirector(serviceReimbursement.getOfficedirector()); // remShare.setFinancedirector(serviceReimbursement.getFinancedirector()); // remShare.setFinancechecher(serviceReimbursement.getFinancechecher()); // remShare.setInfoid(serviceReimbursement.getInfoid()); // remShare.setDonorno(serviceReimbursement.getDonorno()); // // remShare.setDonorname(serviceReimbursement.getDonorname()); // remShare.setReason(serviceReimbursement.getReason()); // remShare.setRecordstatus(serviceReimbursement.getRecordstatus()); // remShare.setUploadflag(serviceReimbursement.getUploadflag()); // remShare.setUploadtime(serviceReimbursement.getUploadtime()); // // nTemp = serviceReimbursement.getTotalamount(); // if (nTemp == null) nTemp = 0.0; // remShare.setTotalamount(BigDecimal.valueOf(nTemp)); // // remShare.setBigstrmoney(serviceReimbursement.getBigstrmoney()); // remShare.setFlowlevel(serviceReimbursement.getFlowlevel()); // remShare.setCosttype(serviceReimbursement.getCosttype()); // remShare.setCosttypename(serviceReimbursement.getCosttypename()); // remShare.setFileurl(serviceReimbursement.getAnnexfiles()); // remShare.setDonorbank(serviceReimbursement.getDonorbank()); // remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard()); // remShare.setDonorremark(serviceReimbursement.getDonorremark()); // // nTemp = serviceReimbursement.getDonoramount(); // if (nTemp == null) nTemp = 0.0; // remShare.setDonoramount(nTemp); // remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives()); // //remShare.setOaid(serviceReimbursement.getOaid()); // //remShare.setDonorno(serviceReimbursement.getDonorno()); // // boolean bRet = false; // if (nType == 1) { // bRet = serviceReimbursementServiceShare.save(remShare); // } else { // //remShare.setId(serviceReimbursement.); // bRet = serviceReimbursementServiceShare.updateById(remShare); // } // // //if(!bRet) return -1; // String strMutfileUrl = remShare.getFileurl(); // //有附件时才调用第三方进行上传 // if (strMutfileUrl == null) return 0; // if (strMutfileUrl.isEmpty()) return 0; // // try { // uploadOAFileAndUpdateDb(remShare); // } catch (Exception e) { // logger.error("调用第三方接口出错!"); // e.printStackTrace(); // } // // //此处保存成功后要上传OA，保存返回值 // // return 0; // } int uploadOAFileAndUpdateDb(ServiceReimbursementShared remShare) { @@ -439,12 +427,12 @@ } long nId = remShare.getId(); remShare.setId(nId); remShare.setFilename(filename); remShare.setFileid(fileid); boolean bRet = serviceReimbursementServiceShare.updateById(remShare); if (!bRet) return -1; // long nId = remShare.getId(); // remShare.setId(nId); // remShare.setFilename(filename); // remShare.setFileid(fileid); // boolean bRet = serviceReimbursementServiceShare.updateById(remShare); // if (!bRet) return -1; return 0; } @@ -627,9 +615,9 @@ @RepeatSubmit public AjaxResult edit(@RequestBody ServiceReimbursement serviceReimbursement) { boolean b = serviceReimbursementService.updateById(serviceReimbursement); if (b) { addReiSharedDatd(serviceReimbursement, 2); } // if (b) { // addReiSharedDatd(serviceReimbursement, 2); // } return toAjax(b); }
@@ -70,18 +70,18 @@ return AjaxResult.success(serviceReimbursementSharedService.getById(id)); } /** * 新增报销申请 */ @ApiOperation("新增报销申请") //@PreAuthorize("@ss.hasPermi('system:shared:add')") @Log(title = "报销申请", businessType = BusinessType.INSERT) @PostMapping @RepeatSubmit public AjaxResult add(@RequestBody ServiceReimbursementShared serviceReimbursementShared) { return toAjax(serviceReimbursementSharedService.save(serviceReimbursementShared)); } // /** // * 新增报销申请 // */ // @ApiOperation("新增报销申请") // //@PreAuthorize("@ss.hasPermi('system:shared:add')") // @Log(title = "报销申请", businessType = BusinessType.INSERT) // @PostMapping // @RepeatSubmit // public AjaxResult add(@RequestBody ServiceReimbursementShared serviceReimbursementShared) // { // return toAjax(serviceReimbursementSharedService.save(serviceReimbursementShared)); // } /** * 修改报销申请 @@ -90,7 +90,7 @@ //@PreAuthorize("@ss.hasPermi('system:shared:edit')") @Log(title = "报销申请", businessType = BusinessType.UPDATE) @PutMapping @RepeatSubmit @RepeatSubmit public AjaxResult edit(@RequestBody ServiceReimbursementShared serviceReimbursementShared) { return toAjax(serviceReimbursementSharedService.updateById(serviceReimbursementShared)); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.List; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.bean.DtoConversionUtils; import com.ruoyi.project.domain.*; import com.ruoyi.project.domain.dto.ServiceReimbursementDto; @@ -18,9 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.ArrayList; import java.util.Map; import java.util.stream.Collectors; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.project.service.IServiceReimbursementService; @@ -37,9 +34,6 @@ @Autowired ServiceReimbursementMapper serviceReimbursementMapper; @Autowired ServiceReimbursementSharedMapper serviceReimbursementShareMapper; @Autowired ServiceReimbursementdetailMapper serviceReimbursementdetailMapper;
