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

@@ -2125,8 +2125,12 @@
    @PostMapping("/totaltax")
    @RepeatSubmit
    public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
        Boolean totaltax = serviceFundService.totaltax(totalTaxVO);
        if(totaltax){
            return AjaxResult.success("合计个税成功,请去E:\\OPO\\WEB\\Upload\\download ä¸­æŸ¥æ‰¾æ–‡ä»¶");
        }

        return AjaxResult.success(serviceFundService.totaltax(totalTaxVO));
        return AjaxResult.success("合计失败，请稍后重试");
    }

}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TotalTaxVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.project.domain.vo;

import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFunddetailVO;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * åˆè®¡ä¸ªç¨Ž
 *
 * @author ls
 */
@Data
public class TotalTaxVO {
    /**
     * è®¡ç®—个税的fundid集合
     */
    List<Long> fundids;

    /**
     * è®¡ç®—个税之后，还是之后;  ç¨Žå‰ï¼š0   ç¨ŽåŽï¼š1
     */
    Integer isTaxAfter;
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -14,6 +14,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
@@ -759,6 +760,9 @@
            totalTaxVO.setIsTaxAfter(0);
        }
        List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.totlaTax(totalTaxVO.getFundids());
        if (CollectionUtils.isEmpty(serviceFunddetails)) {
            throw new BaseException("查询的详情数据为空");
        }

        //用于返回excel
        List<ServiceFunddetailExcel> serviceFunddetailList = new ArrayList<>();
@@ -791,7 +795,8 @@
            //打印算过税之后的，合计excel
            util.exportExcel(serviceFunddetailList, "合计个税（税后）");
        } else {
            a : for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
            a:
            for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
                ServiceFunddetailExcel sfeBefore = new ServiceFunddetailExcel();
                ServiceFunddetailExcel sfeAfter = new ServiceFunddetailExcel();

@@ -804,7 +809,10 @@


                for (ServiceFunddetail serviceFunddetail2 : serviceFunddetails) {
                    if (serviceFunddetail.getBeneficiaryname().trim().equals(serviceFunddetail2.getBeneficiaryname().trim()) && !(serviceFunddetail2.getServicesscopename().trim().equals("税后"))) {
                    if (StringUtils.isEmpty(serviceFunddetail2.getServicesscopename())) {
                        throw new BaseException("服务说明为空,请检查后再计算");
                    }
                    if (serviceFunddetail.getBeneficiaryname().equals(serviceFunddetail2.getBeneficiaryname()) && !(serviceFunddetail2.getServicesscopename().equals("税后"))) {
                        //累计税前
                        sfeBefore.setIdcardno(serviceFunddetail2.getIdcardno());
                        sfeBefore.setBankcardno(serviceFunddetail2.getBankcardno());
@@ -820,7 +828,7 @@
                        }
                        sfeBefore.setTaxedamount(null);

                    } else if (serviceFunddetail.getBeneficiaryname().trim().equals(serviceFunddetail2.getBeneficiaryname().trim()) && serviceFunddetail2.getServicesscopename().trim().equals("税后")) {
                    } else if (serviceFunddetail.getBeneficiaryname().equals(serviceFunddetail2.getBeneficiaryname()) && serviceFunddetail2.getServicesscopename().equals("税后")) {
                        //累计税后
                        sfeAfter.setIdcardno(serviceFunddetail2.getIdcardno());
                        sfeAfter.setBankcardno(serviceFunddetail2.getBankcardno());