代码提交

liusheng

2024-03-20 4c95b4e5fee50a03c8ba964264ea3ef163e7805b

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

@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
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;
@@ -17,6 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -45,6 +47,10 @@
    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);
    }
//
@@ -69,7 +75,7 @@
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id);
        ServiceFund serviceFund=new ServiceFund();
        ServiceFund serviceFund = new ServiceFund();
        serviceFund.setFundTaxId(id);
        serviceFundtax.setServiceFunds(serviceFundService.queryList(serviceFund));
        return AjaxResult.success(serviceFundtax);
@@ -109,7 +115,8 @@
    @PostMapping("/addFundTax")
    public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
        serviceFundtax.setTaxedtime(new Date());
        serviceFundtax.setApplyno(UUID.randomUUID().toString());

        serviceFundtax.setApplyno(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
        serviceFundtaxService.save(serviceFundtax);
        for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
            serviceFund.setFundTaxId(serviceFundtax.getId());