修改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;
@@ -177,19 +185,15 @@
    @Transactional
    @Override
    public R delete(IdDTO idDTO, Long communityId) {
        StringBuilder rt = new StringBuilder();
        String[] idarr = idDTO.getId().split(",");
        for(String id:idarr){
            if(StringUtils.isEmpty(id)){
                continue;
        String[] ids = idDTO.getId().split(",");
        for(String id:ids){
            EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
            if(eventVisitingTasksDO != null){
                if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
                    return R.fail("您选择的走访任务中有已走访的不可删除");
                }
                eventVisitingTasksMapper.deleteById(id);
            }
            String error = toDelete(Long.valueOf(id));
            if(!StringUtils.isEmpty(error)){
                rt.append(rt);
            }
        }
        if(!StringUtils.isEmpty(rt)){
            return R.fail("部分删除失败:"+rt.toString());
        }
        return R.ok();
    }
@@ -202,7 +206,7 @@
        if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
            return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
        }
        eventVisitingTasksMapper.deleteById(Long.valueOf(id));
        eventVisitingTasksMapper.deleteById(id);
        return null;
    }

@@ -231,7 +235,10 @@
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            eventVisitingTasksDetailsVO.setVisiterPhone(eventVisitingTasksDO.getVisiterTele());
            if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
                eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
                eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
            }
            JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
            eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            if(jsonObject != null && jsonObject.get("check") != null){
@@ -242,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();
@@ -263,7 +270,7 @@
            if(StringUtils.isEmpty(idstr)){
                continue;
            }
            String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
            String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
            if(!StringUtils.isEmpty(error)){
                rt.append(error);
            }
@@ -280,7 +287,7 @@
        return page.getRecords();
    }

    private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
    private String addVisitingTask(Long id, Long gridId,Long userId) throws Exception{

        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
@@ -291,7 +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()));
@@ -367,7 +384,7 @@
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
            return R.fail("当前状态不可撤销");
        }
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
        if(rt > 0){
            return R.ok();
        }
@@ -379,7 +396,7 @@
    public R reset(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
            return R.fail("当前状态不可恢复");
        }
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
@@ -404,7 +421,7 @@
        start.setGridMember(Long.valueOf(map.get("user_id").toString()));
        start.setGridMemberName(map.get("name").toString());
        start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
        start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
        start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
        int rt = eventVisitingTasksMapper.start(start);
        if(rt > 0){
            return R.ok();
@@ -432,11 +449,8 @@

        EventVisitingTasksDO complete = new EventVisitingTasksDO();
        BeanUtils.copyProperties(taskCompleteDTO,complete);
        if(taskCompleteDTO.getException() == 0){
            complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
        }else{
            complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
        }
        complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());

        complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
        if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
            JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
@@ -469,7 +483,7 @@
        complete.setGridMemberName(map.get("name").toString());
        complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());

        int rt = eventVisitingTasksMapper.complete(complete);
        int rt = eventVisitingTasksMapper.updateById(complete);
        if(rt > 0){
            return R.ok();
        }