代码提交

liusheng

2023-11-10 19b8481dd1b30368f97a2a983f61ff93a340a98c

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

@@ -1,13 +1,10 @@
package com.ruoyi.project.service.impl;

import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSON;
@@ -15,7 +12,7 @@
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.ChineseUtils;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -28,7 +25,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -692,11 +688,19 @@

        List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
        if (CollectionUtils.isEmpty(serviceFunddetails)) {
            System.out.println("serviceFunddetails为空喽");
            return null;
            throw new BaseException("serviceFunddetails为空喽");
        }
        // 保存详情数据
        for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
            if (StringUtils.isEmpty(serviceFunddetailVO.getIdcardno())) {
                throw new BaseException("请检查身份证号,身份证号为空了,姓名：" + serviceFunddetailVO.getBeneficiaryname());
            }
            if (StringUtils.isEmpty(serviceFunddetailVO.getTitle()) || ChineseUtils.isChinese(serviceFunddetailVO.getTitle())) {
                throw new BaseException("请检查职称是否为空（或不是中文）,姓名：" + serviceFunddetailVO.getBeneficiaryname() + "  职称:" + serviceFunddetailVO.getTitle());
            }
            if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
                throw new BaseException("请检查银行卡号是否为空,姓名：" + serviceFunddetailVO.getBeneficiaryname());
            }
            serviceFunddetailVO.setFundid(id);
            //將附件转成json
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
@@ -754,7 +758,9 @@
    }

    @Override
    public Boolean totaltax(TotalTaxVO totalTaxVO) {
    public Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO) {
        Map<String, List<ServiceFunddetailExcel>> map = new HashMap<>();

        if (totalTaxVO.getIsTaxAfter() == null) {
            //如何为空，默认当没有算过税，进行合计
            totalTaxVO.setIsTaxAfter(0);
@@ -766,8 +772,6 @@

        //用于返回excel
        List<ServiceFunddetailExcel> serviceFunddetailList = new ArrayList<>();
        //打印excel
        ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);

        if (totalTaxVO.getIsTaxAfter() == 1) {
            //通过受益人名称，将税前、税后的值相加
@@ -792,8 +796,10 @@
                }
                serviceFunddetailList.add(serviceFunddetailExcel);
            }
            //打印算过税之后的，合计excel
            util.exportExcel(serviceFunddetailList, "合计个税（税后）");
            //返回算过税之后的，合计
            map.put("合计个税（税后）", serviceFunddetailList);
            return map;

        } else {
            a:
            for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
@@ -810,7 +816,11 @@

                for (ServiceFunddetail serviceFunddetail2 : serviceFunddetails) {
                    if (StringUtils.isEmpty(serviceFunddetail2.getServicesscopename())) {
                        throw new BaseException("服务说明为空,请检查后再计算");
                        ServiceFund serviceFund = null;
                        if (serviceFunddetail2.getFundid() == null) {
                            serviceFund = serviceFundMapper.selectById(serviceFunddetail2.getFundid());
                        }
                        throw new BaseException("服务说明为空,请检查后再计算,捐献者为 :" + serviceFund.getDonorname());
                    }
                    if (serviceFunddetail.getBeneficiaryname().equals(serviceFunddetail2.getBeneficiaryname()) && !(serviceFunddetail2.getServicesscopename().equals("税后"))) {
                        //累计税前
@@ -852,10 +862,10 @@
                if (ObjectUtils.isNotEmpty(sfeAfter.getBeneficiaryname())) serviceFunddetailList.add(sfeAfter);

            }
            //打印算税之前的，合计excel
            util.exportExcel(serviceFunddetailList, "合计个税（税前）");
            //返回算税之前的，合计
            map.put("合计个税（税前）", serviceFunddetailList);
            return map;
        }
        return true;
    }