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/EventTransferRecordServiceImpl.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.EventTransferRecordDetailsVO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.EventTransferRecordMapper;
import com.panzhihua.service_grid.model.dos.EventTransferRecordDO;
import com.panzhihua.service_grid.service.EventTransferRecordService;
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 EventTransferRecordServiceImpl extends ServiceImpl<EventTransferRecordMapper, EventTransferRecordDO> implements EventTransferRecordService {
public class EventTransferRecordServiceImpl extends ServiceImpl<EventTransferRecordMapper, EventTransferRecordDO>
    implements EventTransferRecordService {

    @Resource
    private EventTransferRecordMapper eventTransferRecordMapper;

    /**
     * 新增事件处理流转记录
     * 
     * @param eventTransferRecordAddDTO
     * @return 新增结果
     */
@@ -48,6 +54,7 @@

    /**
     * 修改事件处理流转记录
     * 
     * @param eventTransferRecordEditDTO
     * @return 维护结果
     */
@@ -63,6 +70,7 @@

    /**
     * 分页查找事件处理流转记录
     * 
     * @param pageEventTransferRecordDTO
     * @return 维护结果
     */
@@ -79,6 +87,7 @@

    /**
     * 删除事件处理流转记录
     * 
     * @param EventTransferRecordDeleteDTO
     * @return 平台用户信息
     */
@@ -88,7 +97,9 @@

    /**
     * 查询事件处理流转记录详细信息
     * @param id 事件处理流转记录 id
     * 
     * @param id
     *            事件处理流转记录 id
     * @return 查找结果
     */
    public R<EventTransferRecordDetailsVO> eventTransferRecordDetails(Long id){