走访任务修改

xyh

2021-06-25 41ee26f49db69e01dab44c36d86760f3fa2a3c87

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_grid.service.impl;

import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,15 +9,18 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.grid.EventVisitingTasksAddDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.visit.*;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
@@ -28,11 +33,6 @@
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.*;

/**
@@ -145,13 +145,24 @@
                eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
            }
            if(eventVisitingTasksVO.getVisiterTele() != null){

            }
            eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey));
        }
        page.getRecords().forEach(e->{
        }
        return R.ok(page);
    }

        });
    @Override
    public R appTaskList(EventTasksQuery query) throws Exception{

        IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
        for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){
            if(eventVisitingTasksVO.getNationCode() != null){
                eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
            }
            if(eventVisitingTasksVO.getVisiterTele() != null){
                eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey));
            }
        }
        return R.ok(page);
    }

@@ -251,7 +262,7 @@
        visitingTasksDO.setVisiterType(0);
        visitingTasksDO.setActOpara(0);
        if(map.get("lat") != null && map.get("lng") != null){
            visitingTasksDO.setHappentLatLng(map.get("lat")+"-"+map.get("lng"));
            visitingTasksDO.setHappentLatLng(map.get("lat")+","+map.get("lng"));
        }
        visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
        visitingTasksDO.setReporting(0);
@@ -359,49 +370,59 @@
    @Override
    public R complete(EventVisitCompleteDTO taskCompleteDTO) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId());
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.JXZ.getCode()){
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
            return R.fail("当前状态不可完成走访");
        }
        EventVisitingTasksDO complete = new EventVisitingTasksDO();
        BeanUtils.copyProperties(taskCompleteDTO,complete);
        if(taskCompleteDTO.getException().intValue() == 0){
            taskCompleteDTO.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
            complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
        }else{
            taskCompleteDTO.setEventStatus(EventTasksStatusEnum.YC.getCode());
            complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
        }

        complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
        JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
        json.put("check",taskCompleteDTO.getOption());
        taskCompleteDTO.setOption(json.toJSONString());
        complete.setTableContentJson(json.toJSONString());

        if(!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())){
        if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){
            taskCompleteDTO.getImgList().forEach(e->{
                createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,1,e);
                createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,1,e);
            });
        }
        if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){
            taskCompleteDTO.getVosList().forEach(e->{
                createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,2,e);
                createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,2,e);
            });
        }
        if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
            taskCompleteDTO.getVosList().forEach(e->{
                createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,3,e);
                createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e);
            });
        }

        int rt = eventVisitingTasksMapper.complete(taskCompleteDTO);
        Map<String,Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId());
        complete.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
        complete.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
        complete.setGridMember(Long.valueOf(map.get("user_id").toString()));
        complete.setGridMemberName(map.get("name").toString());
        complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());

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

    private void createResource(Long id, Long dellUserId, int classification, int type,String url) {
    private void createResource(Long id, Long dellUserId, int classification, int type, EventResourceDTO resourceDTO) {
        EventResourceDO eventResourceDO = new EventResourceDO();
        eventResourceDO.setRefId(id);
        eventResourceDO.setClassification(classification);
        eventResourceDO.setType(type);
        eventResourceDO.setCreateBy(dellUserId);
        eventResourceDO.setUrl(url);
        eventResourceDO.setUrl(resourceDTO.getUrl());
        eventResourceDO.setResourceTime(resourceDTO.getResourceTime());
        eventResourceMapper.insert(eventResourceDO);
    }