代码提交

liusheng

2024-03-20 c642194fc7764a59787ac937239f26b27e0dcbad

代码提交

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

@@ -31,14 +31,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Options;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;


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

@@ -6,13 +6,10 @@
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.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 +17,7 @@
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.util.*;

/**
 * 专家费用算税申请主Controller
@@ -66,17 +60,21 @@
//        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:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id);
        ServiceFund serviceFund=new ServiceFund();
        serviceFund.setFundTaxId(id);
        serviceFundtax.setServiceFunds(serviceFundService.queryList(serviceFund));
        return AjaxResult.success(serviceFundtax);
    }


    /**
     * 修改专家费用算税申请主
@@ -117,7 +115,9 @@
            serviceFund.setFundTaxId(serviceFundtax.getId());
            serviceFundService.updateById(serviceFund);
        }
        return toAjax(serviceFundtax.getId().intValue());
        Map<String, Long> map = new HashMap<>();
        map.put("fundTaxId", serviceFundtax.getId());
        return AjaxResult.success(map);
    }

    /**

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java

@@ -208,7 +208,7 @@

    @ApiModelProperty("申请时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date applicanttime;

    @ApiModelProperty("审核人编号")

 ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml

@@ -139,7 +139,7 @@

    <select id="getMaxFundTaxId" resultType="integer">
        select max(id) maxid
        from service_fund
        from service_fundtax
        where del_flag = 0;
    </select>