Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2026-03-10 68b27795ae929f5300fc6fb301b31aada74a2e2f

 tms/src/main/java/com/ruoyi/tms/controller/TmsFinanceDetailController.java

@@ -1,6 +1,9 @@
package com.ruoyi.tms.controller;

import java.util.List;

import com.ruoyi.tms.domain.TmsFinance;
import com.ruoyi.tms.service.ITmsFinanceService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +36,9 @@
{
    @Autowired
    private ITmsFinanceDetailService tmsFinanceDetailService;

    @Autowired
    private ITmsFinanceService tmsFinanceService;



@@ -81,7 +87,36 @@
    @PostMapping
    public AjaxResult add(@RequestBody TmsFinanceDetail tmsFinanceDetail)
    {
        return toAjax(tmsFinanceDetailService.insertTmsFinanceDetail(tmsFinanceDetail));
        int i = tmsFinanceDetailService.insertTmsFinanceDetail(tmsFinanceDetail);
        if(i<=0){
            return error("新增失败");
        }else{
            TmsFinance tmsFinance = tmsFinanceService.selectTmsFinanceById(tmsFinanceDetail.getFinanceId());
            return AjaxResult.success(tmsFinance);
        }
    }

    @PreAuthorize("@ss.hasPermi('tms:tmsFinanceDetail:add')")
    @Log(title = "费用明细", businessType = BusinessType.INSERT)
    @PostMapping("save")
    public AjaxResult save(@RequestBody TmsFinanceDetail tmsFinanceDetail)
    {
        int i = tmsFinanceDetailService.saveTmsFinanceDetail(tmsFinanceDetail);
        if(i<=0){
            return error("新增失败");
        }else{
            TmsFinance tmsFinance = tmsFinanceService.selectTmsFinanceById(tmsFinanceDetail.getFinanceId());
            return AjaxResult.success(tmsFinance);
        }
    }

    @PreAuthorize("@ss.hasPermi('tms:tmsFinanceDetail:add')")
    @Log(title = "费用明细", businessType = BusinessType.INSERT)
    @PostMapping("save2")
    public AjaxResult save2(@RequestBody List<TmsFinanceDetail> tmsFinanceDetails)
    {
        return toAjax(tmsFinanceDetailService.saveTmsFinanceDetail2(tmsFinanceDetails));

    }

    /**
@@ -92,9 +127,21 @@
    @PutMapping
    public AjaxResult edit(@RequestBody TmsFinanceDetail tmsFinanceDetail)
    {
        return toAjax(tmsFinanceDetailService.updateTmsFinanceDetail(tmsFinanceDetail));
        int i = tmsFinanceDetailService.updateTmsFinanceDetail(tmsFinanceDetail);
        if(i<=0){
            return error("修改失败");
        }else{
            TmsFinance tmsFinance = tmsFinanceService.selectTmsFinanceById(tmsFinanceDetail.getFinanceId());
            return AjaxResult.success(tmsFinance);
        }
    }

    @GetMapping("/cancelFinanceDetail/{id}")
    public AjaxResult cancelFinanceDetail(@PathVariable Integer id){
        return tmsFinanceDetailService.cancelFinanceDetail(id);
    }


    /**
     * 删除费用明细
     */