PDF合并，BUG修改

liusheng

2024-04-22 57a6735173d59feb6cfd95c9a8ec76d6f87bc578

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

@@ -28,15 +28,14 @@

/**
 * 捐献随访Controller
 * 
 *
 * @author ruoyi
 * @date 2021-12-10
 */
@Api("捐献随访")
@RestController
@RequestMapping("/project/donatefollowup")
public class ServiceDonatefollowupController extends BaseController
{
public class ServiceDonatefollowupController extends BaseController {
    @Autowired
    private IServiceDonatefollowupService serviceDonatefollowupService;

@@ -46,8 +45,7 @@
    @ApiOperation("查询捐献随访列表")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup)
    {
    public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup) {
        startPage();
        //List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
        List<ServiceDonatefollowup> list = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
@@ -55,7 +53,7 @@
    }

    @GetMapping("/listnew")
    public TableDataInfo listnew (DonateFollowupVO donateFollowupVO){
    public TableDataInfo listnew(DonateFollowupVO donateFollowupVO) {
        startPage();
        List<DonateFollowupVO> list = serviceDonatefollowupService.selectVOList(donateFollowupVO);
        return getDataTable(list);
@@ -70,8 +68,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:export')")
    @Log(title = "捐献随访", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatefollowup serviceDonatefollowup)
    {
    public AjaxResult export(ServiceDonatefollowup serviceDonatefollowup) {
        List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
        ExcelUtil<ServiceDonatefollowup> util = new ExcelUtil<ServiceDonatefollowup>(ServiceDonatefollowup.class);
        return util.exportExcel(list, "捐献随访数据");
@@ -83,8 +80,7 @@
    @ApiOperation("获取捐献随访详细信息")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        //return AjaxResult.success(serviceDonatefollowupService.getById(id));
        return AjaxResult.success(serviceDonatefollowupService.selectFollowUpById(id));
    }
@@ -95,11 +91,11 @@
    @ApiOperation("新增捐献随访")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:add')")
    @Log(title = "捐献随访", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
    {
        return toAjax(serviceDonatefollowupService.save(serviceDonatefollowup));
    public AjaxResult add(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
        boolean save = serviceDonatefollowupService.save(serviceDonatefollowup);
        return AjaxResult.success(serviceDonatefollowup);
    }

    /**
@@ -109,9 +105,8 @@
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:edit')")
    @Log(title = "捐献随访", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
        return toAjax(serviceDonatefollowupService.updateById(serviceDonatefollowup));

    }
@@ -123,8 +118,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:remove')")
    @Log(title = "捐献随访", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonatefollowupService.removeByIds(Arrays.asList(ids)));
    }
}