Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java

@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
@@ -31,15 +32,22 @@

    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;
    @Resource
    private UserService userService;

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
    public R add(EventGridMemberAddDTO eventGridMemberAddDTO){

        userService.addGridUser(eventGridMemberAddDTO);



        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
        eventGridMemberRelationDO.setCreateAt(new Date());
        eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId());
        if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
            return R.ok();
        }
@@ -48,12 +56,12 @@

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
    public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
    public R edit(EventGridMemberEditDTO eventGridMemberEditDTO){
        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
        BeanUtils.copyProperties(eventGridMemberEditDTO, eventGridMemberRelationDO);
        //eventGridMemberRelationDO.setUpdateAt(new Date());
        if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
            return R.ok();