Merge remote-tracking branch 'origin/master'

feige

2024-06-10 2f432628a460a73f830c278a7d69e8328767a7b6

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java

@@ -3,11 +3,16 @@
import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.domain.MeetingStatistic;

import com.ruoyi.service.MeetingStatisticService;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.web.bind.annotation.*;



import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;

import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;



@RestController

@RequestMapping("/zMeetingStatistic")

@@ -16,6 +21,30 @@
    private MeetingStatisticService meetingStatisticService;



    /**

     * 全部数据

     */

    @GetMapping("/all")

    public AjaxResult listAll(MeetingStatistic meetingStatistic){

        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);

        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);

        return meetingStatisticService.selectDataList(meetingStatistic, pageNum, pageSize);

    }

    /**

     * 根据id,获取会议记录详细信息

     */

    @GetMapping(value = "/{id}")

    public AjaxResult getInfo(@PathVariable("id") Long id) {

        return success(meetingStatisticService.getById(id));

    }



    /**

     * 只输出家庭号和创建时间

     */

    @GetMapping("/one")

    public AjaxResult listOne(MeetingStatistic meetingStatistic){

        return meetingStatisticService.DataList(meetingStatistic);

    }

    /**

     * 修改会议统计

     */

    @Log(title = "会议统计", businessType = BusinessType.UPDATE)

@@ -24,6 +53,7 @@
        return meetingStatisticService.updateData(meetingStatistic);

    }





    /**

     * 批量删除会议统计记录

     */