Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberWarnLogMapper.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_grid.dao;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,10 +9,8 @@
import com.panzhihua.common.model.dtos.grid.EventGridMemberWainDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogAdminVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberWarnLogDO;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.panzhihua.service_grid.model.dos.EventGridMemberWarnLogDO;

/**
 * DAO
@@ -29,15 +29,19 @@
     * @param pageEventGridMemberWarnLogDTO
     * @return
     */
    IPage<EventGridMemberWarnLogVO> findByPage(Page page, @Param("pageEventGridMemberWarnLogDTO") PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO);
    IPage<EventGridMemberWarnLogVO> findByPage(Page page,
        @Param("pageEventGridMemberWarnLogDTO") PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO);

    /**
     * 后台获取网格员预警记录
     * @param gridMemberWainDTO 请求参数
     * @return  预警记录
     * 
     * @param gridMemberWainDTO
     *            请求参数
     * @return 预警记录
     */
    IPage<EventGridMemberWarnLogAdminVO> gridMemberWorkWarning(Page page, @Param("gridMemberWainDTO") EventGridMemberWainDTO gridMemberWainDTO);
    IPage<EventGridMemberWarnLogAdminVO> gridMemberWorkWarning(Page page,
        @Param("gridMemberWainDTO") EventGridMemberWainDTO gridMemberWainDTO);

    void setUserWorkStatus(@Param("userId") Long userId,@Param("workStatus") Integer workStatus);
    void setUserWorkStatus(@Param("userId") Long userId, @Param("workStatus") Integer workStatus);

}