代码提交

liusheng

2024-03-19 519886a70d630e3cdd6c0f40f55fcebc6e780dc5

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

@@ -53,29 +53,30 @@
        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
        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:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundtaxService.getById(id));
    }
//
//    /**
//     * 导出专家费用算税申请主列表
//     */
//    @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:query')")
//    @GetMapping(value = "/getInfo/{id}")
//    public AjaxResult getInfo(@PathVariable("id") Long id) {
//        return AjaxResult.success(serviceFundtaxService.getById(id));
//    }
//

    /**
     * 修改专家费用算税申请主
@@ -95,12 +96,9 @@
    @ApiOperation("删除专家费用算税申请主")
    @PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.DELETE)
    @GetMapping("/remove/id")
    @GetMapping("/remove/{id}")
    public AjaxResult remove(@PathVariable Long id) {
        ServiceFundtax serviceFundtax = new ServiceFundtax();
        serviceFundtax.setDel_flag(1);
        serviceFundtax.setId(id);
        return toAjax(serviceFundtaxService.updateById(serviceFundtax));
        return toAjax(serviceFundtaxService.removeById(id));
    }


@@ -111,16 +109,15 @@
    @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) {
        serviceFundtaxService.save(serviceFundtax);
        for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
            serviceFund.setFundTaxId(serviceFundtax.getId());
            serviceFundService.updateById(serviceFund);
        }
        return toAjax(save);
        return toAjax(serviceFundtax.getId().intValue());
    }

    /**