代码提交

liusheng

2024-04-09 4207b9bd1dd2f81eea512a82085c4083be5e6d44

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

@@ -6,13 +6,11 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonateannex;
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFundtax;
import com.ruoyi.project.domain.vo.FundTaxVO;
import com.ruoyi.project.domain.vo.TotalTaxVO;
import com.ruoyi.project.service.IServiceFundService;
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFundtaxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,10 +18,8 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 * 专家费用算税申请主Controller
@@ -51,21 +47,25 @@
    public TableDataInfo list(ServiceFundtax serviceFundtax) {
        startPage();
        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
        Collections.sort(list, (sft1, sft2) -> {
            Long i = sft2.getId() - sft1.getId();
            return i.intValue();
        });
        return getDataTable(list);
    }

    /**
     * 导出专家费用算税申请主列表
     */
    @ApiOperation("导出专家费用算税申请主列表")
    @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundtax serviceFundtax) {
        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
        ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
        return util.exportExcel(list, "专家费用算税申请主数据");
    }
//
//    /**
//     * 导出专家费用算税申请主列表
//     */
//    @ApiOperation("导出专家费用算税申请主列表")
//    @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
//    @Log(title = "专家费用算税申请主", businessType = BusinessType.EXPORT)
//    @GetMapping("/export")
//    public AjaxResult export(ServiceFundtax serviceFundtax) {
//        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
//        ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
//        return util.exportExcel(list, "专家费用算税申请主数据");
//    }

    /**
     * 获取专家费用算税申请主详细信息
@@ -74,8 +74,13 @@
    @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundtaxService.getById(id));
        ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id);
        ServiceFund serviceFund = new ServiceFund();
        serviceFund.setFundTaxId(id);
        serviceFundtax.setServiceFunds(serviceFundService.queryList(serviceFund));
        return AjaxResult.success(serviceFundtax);
    }


    /**
     * 修改专家费用算税申请主
@@ -108,16 +113,18 @@
    @PreAuthorize("@ss.hasPermi('system:fundtax:add')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.INSERT)
    @PostMapping("/addFundTax")
    public AjaxResult addFundTax(@RequestBody List<ServiceFund> fundList) {
        ServiceFundtax serviceFundtax = new ServiceFundtax();
    public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
        serviceFundtax.setTaxedtime(new Date());
        serviceFundtax.setApplyno(UUID.randomUUID().toString());
        boolean save = serviceFundtaxService.save(serviceFundtax);
        for (ServiceFund serviceFund : fundList) {

        serviceFundtax.setApplyno(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
        serviceFundtaxService.save(serviceFundtax);
        for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
            serviceFund.setFundTaxId(serviceFundtax.getId());
            serviceFundService.updateById(serviceFund);
        }
        return toAjax(save);
        Map<String, Long> map = new HashMap<>();
        map.put("fundTaxId", serviceFundtax.getId());
        return AjaxResult.success(map);
    }

    /**