ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
@@ -17,6 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; import java.util.*; /** @@ -69,7 +70,7 @@ @GetMapping(value = "/getInfo/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id); ServiceFund serviceFund=new ServiceFund(); ServiceFund serviceFund = new ServiceFund(); serviceFund.setFundTaxId(id); serviceFundtax.setServiceFunds(serviceFundService.queryList(serviceFund)); return AjaxResult.success(serviceFundtax); @@ -109,7 +110,8 @@ @PostMapping("/addFundTax") public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) { serviceFundtax.setTaxedtime(new Date()); serviceFundtax.setApplyno(UUID.randomUUID().toString()); serviceFundtax.setApplyno(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())); serviceFundtaxService.save(serviceFundtax); for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) { serviceFund.setFundTaxId(serviceFundtax.getId()); ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -1,17 +1,16 @@ package com.ruoyi.project.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * 费用申请主对象 service_fund * ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
@@ -273,5 +273,13 @@ @TableField(exist = false) private List<ServiceFund> serviceFunds; /** * 事由备注 */ @ApiModelProperty("事由备注") @Excel(name = "事由备注") private String remark; }
@@ -286,6 +286,7 @@ List<ServiceFunddetail> temporarySave = new ArrayList<>(); //保存总税前金额（用于更新fund表里的） BigDecimal pretaxcost = BigDecimal.valueOf(0.00); BigDecimal taxedcost = BigDecimal.valueOf(0.00); for (ServiceFunddetail serviceFunddetail : serviceFunddetails) { if (StringUtils.isEmpty(serviceFunddetail.getIdcardno())) { logger.info("serviceFunddetail数据入参 ： {}", serviceFunddetail); @@ -297,6 +298,7 @@ } //公司的申请金额也要加进去 pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount())); taxedcost = taxedcost.add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())); serviceFunddetail.setTaxamount(0.0); logger.info("serviceFunddetail更新后的数据 ： {}", serviceFunddetail); @@ -373,6 +375,7 @@ // 将该条数据更新 boolean b = this.updateById(serviceFunddetail3); pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount())); taxedcost = taxedcost.add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())); // 把该数据，放到临时的集合中 temporarySave.add(serviceFunddetail3); } else if (serviceFunddetail.getServicesscopename().contains("税后")) { @@ -403,12 +406,14 @@ // 将该条数据更新 updateById(serviceFunddetail3); pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail3.getAmount())); taxedcost = taxedcost.add(BigDecimal.valueOf(serviceFunddetail3.getTaxedamount())); // 把该数据，放到临时的集合中 temporarySave.add(serviceFunddetail3); } } ServiceFund serviceFund = new ServiceFund(); serviceFund.setPretaxcost(pretaxcost.doubleValue()); serviceFund.setTaxedcost(taxedcost.doubleValue()); serviceFund.setId(serviceFunddetails.get(0).getFundid()); if (ObjectUtils.isEmpty(serviceFund1.getFundtaxtime())) { serviceFund.setFundtaxtime(new Date());
