代码提交

liusheng

21 小时以前 55aac55195dc2bd404042ec099045fee8ac73e81

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java

@@ -12,6 +12,8 @@
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.service.IServiceFunddetailService;
import io.swagger.annotations.Api;
@@ -20,8 +22,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
import java.util.*;

/**
 * 费用申请明细Controller
@@ -161,11 +165,11 @@
        return AjaxResult.success(serviceFunddetailService.getFundDetail(id));
    }

    @ApiOperation("根据条件算税")
    @PostMapping("/calculateTax")
    public AjaxResult calculateTax(@RequestBody List<ServiceFunddetail> serviceFunddetails) {
        return AjaxResult.success(serviceFunddetailService.calculateTax(serviceFunddetails));
    }
//    @ApiOperation("根据条件算税")
//    @PostMapping("/calculateTax")
//    public AjaxResult calculateTax(@RequestBody List<ServiceFunddetail> serviceFunddetails) {
//        return AjaxResult.success(serviceFunddetailService.calculateTax2(serviceFunddetails));
//    }

//    /**
//     * 绩效计算