ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -156,10 +156,16 @@ list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList()); } //通过金额过滤 if (spFinancialExpensesIn.getMoney() != null) { list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getPretaxcost()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList()); } Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() { @Override public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) { return o2.getCreateTime().compareTo(o1.getCreateTime()); return o1.getCreateTime().compareTo(o2.getCreateTime()); } }); return getCustomDataTable(list, pageNum, pageSize); @@ -1108,10 +1114,18 @@ bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": "; bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "，"; bz += "金额 : " + f.getAmount() + "元"; bz += System.lineSeparator(); bz += "<w:br/>"; } if (serviceFund.getApplytype().equals("4")) { i = i + 1; bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，"; bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": "; bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "，"; bz += "金额 : " + f.getAmount() + "元"; bz += "<w:br/>"; } String fyxm = f.getItemname() == null ? "" : f.getItemname(); String fyxm = ""; fyxm += f.getItemname() == null ? "" : f.getItemname(); fyxm += f.getAmount() + "元"; map.put("FYXM", fyxm); @@ -1127,7 +1141,7 @@ // dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整"); //备注里放的是经办人的银行卡信息 dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") ? bz : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno()); dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") || serviceFund.getApplytype().equals("4") ? bz : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno()); dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident()); dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident()); dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident()); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -156,10 +156,15 @@ } //startPage(); List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE); //根据经办人筛选 if (StringUtils.isNotBlank(spFinancialExpensesIn.getUsername())) { list = list.stream().filter(reimbursementOut -> reimbursementOut.getUsername().contains(spFinancialExpensesIn.getUsername())).collect(Collectors.toList()); // 按name字段过滤 } //根据金额筛选 if (spFinancialExpensesIn.getMoney() != null) { list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()) == new BigDecimal(spFinancialExpensesIn.getMoney())).collect(Collectors.toList()); } //根据创建时间排序 Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() { @Override public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) { @@ -711,6 +716,7 @@ Map dataMap = new HashMap(); getData(dataMap, id); String filePath = getClass().getResource("/template/").getPath(); log.info("下载地址是啥？？？{}", filePath); System.out.println(filePath); //设置模本装置方法和路径,FreeMarker支持多种模板装载方法。可以重servlet，classpath，数据库教程装载， configuration.setDirectoryForTemplateLoading(new File(filePath)); @@ -723,7 +729,7 @@ e.printStackTrace(); } String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis()); String name = "差旅费报销申请单_" + dataMap.get("XM") + "_" + newTime; String name = "差旅费报销申请单_" + dataMap.get("JSR") + "_" + newTime; //输出文档路径及名称 File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc"); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -133,6 +133,27 @@ @PostMapping("/reimbursementdetailEdit") //@RepeatSubmit public AjaxResult edit(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) { if (serviceReimbursementdetailVO.getTrafficexpense() == null) { serviceReimbursementdetailVO.setTrafficexpense(new BigDecimal(0)); } if (serviceReimbursementdetailVO.getCityfee() == null) { serviceReimbursementdetailVO.setCityfee(new BigDecimal(0)); } if (serviceReimbursementdetailVO.getHotelexpense() == null) { serviceReimbursementdetailVO.setHotelexpense(new BigDecimal(0)); } if (serviceReimbursementdetailVO.getFoodexpenses() == null) { serviceReimbursementdetailVO.setFoodexpenses(new BigDecimal(0)); } if (serviceReimbursementdetailVO.getFoodallowance() == null) { serviceReimbursementdetailVO.setFoodallowance(new BigDecimal(0)); } if (serviceReimbursementdetailVO.getOtherexpense() == null) { serviceReimbursementdetailVO.setOtherexpense(new BigDecimal(0)); } if (serviceReimbursementdetailVO.getOtherfeeamount() == null) { serviceReimbursementdetailVO.setOtherfeeamount(new BigDecimal(0)); } ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class); if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) { //对前端传过来的数组，进行JSON序列化，并赋值给Annexfiles ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java
@@ -126,7 +126,7 @@ private Long attachcount; /** * 杂费 * 公杂费补助 */ @ApiModelProperty("杂费") @Excel(name = "杂费") @@ -217,6 +217,7 @@ @Excel(name = "所属街道（镇）名称") private String traveltownname; @ApiModelProperty("其它费用") private BigDecimal otherfeeamount; private String otherfeedesc; ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
@@ -63,4 +63,10 @@ @ApiModelProperty("捐献者姓名") private String donorname; /** * 金额 */ @ApiModelProperty("金额") private Double money; } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; @@ -18,8 +19,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.ArrayList; import java.util.Map; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.project.domain.ServiceDonatebaseinfo; import com.ruoyi.project.mapper.BaseOrganizationMapper; @@ -32,8 +35,7 @@ * @date 2021-11-13 */ @Service public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService { public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService { @Autowired BaseOrganizationMapper baseOrganizationMapper; @@ -46,7 +48,6 @@ @Autowired ServiceDonationwitnessMapper serviceDonationwitnessMapper; /** @@ -95,7 +96,9 @@ //发现医院 C1C2AF1N1 String hospitalNo = serviceDonatebaseinfo.getTreatmenthospitalno(); BaseOrganization baseOrganization = baseOrganizationMapper.getOrganizationByNumber(hospitalNo); if (ObjectUtils.isNotEmpty(baseOrganization)) { donateNumber += baseOrganization.getOrganizationid(); } //工作人员 H1H2H3 donateNumber += serviceDonatebaseinfo.getReporterno(); @@ -140,22 +143,18 @@ if(completeDonation < 10){ number = "000" + completeDonation; } else if(completeDonation >= 10 && completeDonation < 100){ } else if (completeDonation >= 10 && completeDonation < 100) { number = "00" + completeDonation; } else if(completeDonation >= 100 && completeDonation < 1000){ } else if (completeDonation >= 100 && completeDonation < 1000) { number = "0" + completeDonation; } else { } else { number = "" + completeDonation; } int last = oldDonateNumber.lastIndexOf("*"); if(last == -1){ return oldDonateNumber; } else { } else { StringBuilder newDonateNumber = new StringBuilder(oldDonateNumber); newDonateNumber.replace(last - 3, last + 1, number);
