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,20 +30,23 @@
 */
@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 新增结果
     */
    public R add(EventMainMemberAddDTO eventMainMemberAddDTO){
    public R add(EventMainMemberAddDTO eventMainMemberAddDTO) {
        EventMainMemberDO eventMainMemberDO = new EventMainMemberDO();
        BeanUtils.copyProperties(eventMainMemberAddDTO, eventMainMemberDO);
        eventMainMemberDO.setCreateAt(new Date());
        if(eventMainMemberMapper.insert(eventMainMemberDO)>0){
        if (eventMainMemberMapper.insert(eventMainMemberDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -48,14 +54,15 @@

    /**
     * 修改重点人群记录
     * 
     * @param eventMainMemberEditDTO
     * @return 维护结果
     */
    public R edit(EventMainMemberEditDTO eventMainMemberEditDTO){
    public R edit(EventMainMemberEditDTO eventMainMemberEditDTO) {
        EventMainMemberDO eventMainMemberDO = new EventMainMemberDO();
        BeanUtils.copyProperties(eventMainMemberEditDTO, eventMainMemberDO);
        //eventMainMemberDO.setUpdateAt(new Date());
        if(eventMainMemberMapper.updateById(eventMainMemberDO)>0){
        // eventMainMemberDO.setUpdateAt(new Date());
        if (eventMainMemberMapper.updateById(eventMainMemberDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -63,15 +70,16 @@

    /**
     * 分页查找重点人群记录
     * 
     * @param pageEventMainMemberDTO
     * @return 维护结果
     */
    public R<IPage<EventMainMemberVO>> query(PageEventMainMemberDTO pageEventMainMemberDTO){
        Page page = new Page(1,10);
        if(pageEventMainMemberDTO.getPageNum()!=null) {
    public R<IPage<EventMainMemberVO>> query(PageEventMainMemberDTO pageEventMainMemberDTO) {
        Page page = new Page(1, 10);
        if (pageEventMainMemberDTO.getPageNum() != null) {
            page.setCurrent(pageEventMainMemberDTO.getPageNum());
        }
        if(pageEventMainMemberDTO.getPageSize()!=null) {
        if (pageEventMainMemberDTO.getPageSize() != null) {
            page.setSize(pageEventMainMemberDTO.getPageSize());
        }
        return R.ok(eventMainMemberMapper.findByPage(page, pageEventMainMemberDTO));
@@ -79,21 +87,24 @@

    /**
     * 删除重点人群记录
     * 
     * @param EventMainMemberDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventMainMemberDeleteDTO EventMainMemberDeleteDTO){
    public R delete(EventMainMemberDeleteDTO EventMainMemberDeleteDTO) {
        return R.fail();
    }

    /**
     * 查询重点人群记录详细信息
     * @param id 重点人群记录 id
     * 
     * @param id
     *            重点人群记录 id
     * @return 查找结果
     */
    public R<EventMainMemberDetailsVO> eventMainMemberDetails(Long id){
    public R<EventMainMemberDetailsVO> eventMainMemberDetails(Long id) {
        EventMainMemberDO eventMainMemberDO = eventMainMemberMapper.selectById(id);
        if(eventMainMemberDO!=null) {
        if (eventMainMemberDO != null) {
            EventMainMemberDetailsVO eventMainMemberDetailsVO = new EventMainMemberDetailsVO();
            BeanUtils.copyProperties(eventMainMemberDO, eventMainMemberDetailsVO);
            return R.ok(eventMainMemberDetailsVO);