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/service/impl/EventMainMemberServiceImpl.java

@@ -1,5 +1,12 @@
package com.panzhihua.service_grid.service.impl;

import java.util.Date;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,15 +17,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventMainMemberDetailsVO;
import com.panzhihua.common.model.vos.grid.EventMainMemberVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.EventMainMemberMapper;
import com.panzhihua.service_grid.model.dos.EventMainMemberDO;
import com.panzhihua.service_grid.service.EventMainMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -27,12 +30,15 @@
 */
@Slf4j
@Service
public class EventMainMemberServiceImpl extends ServiceImpl<EventMainMemberMapper, EventMainMemberDO> implements EventMainMemberService {
public class EventMainMemberServiceImpl extends ServiceImpl<EventMainMemberMapper, EventMainMemberDO>
    implements EventMainMemberService {

    @Resource
    private EventMainMemberMapper eventMainMemberMapper;

    /**
     * 新增重点人群记录
     * 
     * @param eventMainMemberAddDTO
     * @return 新增结果
     */
@@ -48,6 +54,7 @@

    /**
     * 修改重点人群记录
     * 
     * @param eventMainMemberEditDTO
     * @return 维护结果
     */
@@ -63,6 +70,7 @@

    /**
     * 分页查找重点人群记录
     * 
     * @param pageEventMainMemberDTO
     * @return 维护结果
     */
@@ -79,6 +87,7 @@

    /**
     * 删除重点人群记录
     * 
     * @param EventMainMemberDeleteDTO
     * @return 平台用户信息
     */
@@ -88,7 +97,9 @@

    /**
     * 查询重点人群记录详细信息
     * @param id 重点人群记录 id
     * 
     * @param id
     *            重点人群记录 id
     * @return 查找结果
     */
    public R<EventMainMemberDetailsVO> eventMainMemberDetails(Long id){