xyh
2021-06-28 fe8f54b97a98205cb1eaed5e354b87a6bd7582e9
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.enums.EventTasksStatusEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.model.dtos.EventResourceDTO;
import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.helper.AESUtil;
@@ -227,19 +228,27 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public R add(String ids, Long communityId, Long userId) throws Exception {
        Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
        if(CollectionUtils.isEmpty(map)){
            return R.fail("网格员不存在");
        }
        String[] id = ids.split(",");
    public R add(IdDTO idDTO, Long communityId, Long userId) throws Exception {
//        Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
//        if(CollectionUtils.isEmpty(map)){
//            return R.fail("网格员不存在");
//        }
        StringBuilder rt = new StringBuilder();
        String[] id = idDTO.getId().split(",");
        for(String idstr:id){
            if(StringUtils.isEmpty(idstr)){
                continue;
            }
            addVisitingTask(Long.valueOf(idstr),map,communityId,userId);
            String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
            if(!StringUtils.isEmpty(error)){
                rt.append(error);
            }
        }
        if(!StringUtils.isEmpty(rt)){
            return R.fail("部分新增失败"+rt.toString());
        }
        return R.ok();
    }
@@ -249,17 +258,16 @@
        return page.getRecords();
    }
    private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
    private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{
        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
            return "被访问人ID["+id+"]不存在;";
        }
        Integer count = eventVisitingTasksMapper.countNoneComplete(id);
        if(count > 0){
            return;
        }
        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
            return ;
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }
        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
@@ -297,6 +305,7 @@
        }
        eventVisitingTasksMapper.insert(visitingTasksDO);
        return null;
    }
    private List<String> getOption(String label) {