Merge remote-tracking branch 'origin/master'

yxh

2023-05-31 e7acba8aaaa91a067728d4769b4af5a9dd6ac189

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

@@ -6,10 +6,13 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFund;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.lettuce.core.dynamic.annotation.Param;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,8 +44,7 @@
@Api("费用申请明细")
@RestController
@RequestMapping("/project/funddetail")
public class ServiceFunddetailController extends BaseController
{
public class ServiceFunddetailController extends BaseController {
    @Autowired
    private IServiceFunddetailService serviceFunddetailService;

@@ -53,8 +55,7 @@
    @ApiOperation("查询费用申请明细列表")
    //@PreAuthorize("@ss.hasPermi('project:funddetail:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFunddetail serviceFunddetail)
    {
    public TableDataInfo list(ServiceFunddetail serviceFunddetail) {
        startPage();
        //List<ServiceFunddetail> list = serviceFunddetailService.queryList(serviceFunddetail);
        List<ServiceFunddetail> list = serviceFunddetailService.selectServiceFunddetailList(serviceFunddetail);
@@ -68,8 +69,7 @@
    //@PreAuthorize("@ss.hasPermi('project:funddetail:export')")
    @Log(title = "费用申请明细", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFunddetail serviceFunddetail)
    {
    public AjaxResult export(ServiceFunddetail serviceFunddetail) {
        List<ServiceFunddetail> list = serviceFunddetailService.queryList(serviceFunddetail);
        ExcelUtil<ServiceFunddetail> util = new ExcelUtil<ServiceFunddetail>(ServiceFunddetail.class);
        return util.exportExcel(list, "费用申请明细数据");
@@ -81,8 +81,7 @@
    @ApiOperation("获取费用申请明细详细信息")
    //@PreAuthorize("@ss.hasPermi('project:funddetail:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFunddetailService.getById(id));
    }

@@ -94,8 +93,7 @@
    @Log(title = "费用申请明细", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail)
    {
    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
        return toAjax(serviceFunddetailService.save(serviceFunddetail));
    }

@@ -107,8 +105,7 @@
    @Log(title = "费用申请明细", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail)
    {
    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
        return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
    }

@@ -119,8 +116,7 @@
    //@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
    @Log(title = "费用申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFunddetailService.removeByIds(Arrays.asList(ids)));
    }

@@ -131,12 +127,22 @@
    @ApiOperation("删除报销申请明细并修改金额")
    @Log(title = "报销申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/deleteDetail/{id}")
    public AjaxResult deleteDetail(@PathVariable Long id)
    {
    public AjaxResult deleteDetail(@PathVariable Long id) {
        return AjaxResult.success(serviceFunddetailService.deleteDetail(id));
    }


    /**
     * 根据受益人编号获取费用申请明细信息
     */
    @ApiOperation("根据受益人编号获取费用申请明细信息")
    @PostMapping("/getDataBybeneficiaryNo")
    public AjaxResult getDataBybeneficiaryNo(@RequestBody FunddetailReqVo funddetailReqVo) {
//        if (StringUtils.isEmpty(funddetailReqVo.getBeneficiaryNo())) {
//            return AjaxResult.error("受益人编号不能为空");
//        }
        List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailService.getDataBybeneficiaryNo(funddetailReqVo);
        return AjaxResult.success(dataBybeneficiaryNo);
    }


}