修改bug

huanghongfa

2021-07-16 db31c68b10e3a58bce17e3bbf880db05b6f341fe

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

@@ -22,8 +22,10 @@
import com.panzhihua.common.model.vos.visit.*;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.EventGridDataMapper;
import com.panzhihua.service_grid.dao.EventResourceMapper;
import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventResourceService;
@@ -34,6 +36,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toCollection;

import javax.annotation.Resource;
import java.util.*;
@@ -41,6 +45,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @auther lyq
@@ -59,6 +64,9 @@

    @Resource
    private EventResourceService eventResourceService;

    @Resource
    private EventGridDataMapper eventGridDataMapper;

    @Value("${domain.aesKey:}")
    private String aesKey;
@@ -182,7 +190,7 @@
            EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
            if(eventVisitingTasksDO != null){
                if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
                    return R.fail("您选择的走访任务中有已解决的不可删除");
                    return R.fail("您选择的走访任务中有已走访的不可删除");
                }
                eventVisitingTasksMapper.deleteById(id);
            }
@@ -241,7 +249,7 @@
            eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
            eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
            eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));

            eventVisitingTasksDetailsVO.setHappentAddress(eventVisitingTasksDO.getAddress());
            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
@@ -290,8 +298,17 @@
        if(count > 0){
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }



        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridId(gridId);
        //查询网格
        EventGridDataDO gridDataDO = eventGridDataMapper.selectById(gridId);
        if(gridDataDO != null){
            visitingTasksDO.setGridMemberCommunity(gridDataDO.getGridCommunityId());
            visitingTasksDO.setGridMemberStreet(gridDataDO.getGridStreetId());
        }
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
//        visitingTasksDO.setGridMemberCommunity(communityId);
//        visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));