PDF合并，BUG修改

liusheng

2024-04-22 57a6735173d59feb6cfd95c9a8ec76d6f87bc578

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

@@ -20,15 +20,14 @@

/**
 * 费用申请主Controller
 * 
 *
 * @author ruoyi
 * @date 2023-03-27
 */
@Api("费用申请主")
@RestController
@RequestMapping("/system/shared")
public class ServiceFundSharedController extends BaseController
{
public class ServiceFundSharedController extends BaseController {
    @Autowired
    private IServiceFundSharedService serviceFundSharedService;

@@ -38,8 +37,7 @@
    @ApiOperation("查询费用申请主列表")
    @PreAuthorize("@ss.hasPermi('system:shared:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFundShared serviceFundShared)
    {
    public TableDataInfo list(ServiceFundShared serviceFundShared) {
        startPage();
        List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
        return getDataTable(list);
@@ -52,8 +50,7 @@
    @PreAuthorize("@ss.hasPermi('system:shared:export')")
    @Log(title = "费用申请主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundShared serviceFundShared)
    {
    public AjaxResult export(ServiceFundShared serviceFundShared) {
        List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
        ExcelUtil<ServiceFundShared> util = new ExcelUtil<ServiceFundShared>(ServiceFundShared.class);
        return util.exportExcel(list, "费用申请主数据");
@@ -65,8 +62,7 @@
    @ApiOperation("获取费用申请主详细信息")
    @PreAuthorize("@ss.hasPermi('system:shared:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundSharedService.getById(id));
    }

@@ -76,11 +72,11 @@
    @ApiOperation("新增费用申请主")
    @PreAuthorize("@ss.hasPermi('system:shared:add')")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared)
    {
        return toAjax(serviceFundSharedService.save(serviceFundShared));
    public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared) {
        boolean save = serviceFundSharedService.save(serviceFundShared);
        return AjaxResult.success(serviceFundShared);
    }

    /**
@@ -90,9 +86,8 @@
    @PreAuthorize("@ss.hasPermi('system:shared:edit')")
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared) {
        return toAjax(serviceFundSharedService.updateById(serviceFundShared));
    }

@@ -103,8 +98,7 @@
    @PreAuthorize("@ss.hasPermi('system:shared:remove')")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFundSharedService.removeByIds(Arrays.asList(ids)));
    }
}