Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

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

import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import java.util.*;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,22 +38,10 @@
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
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.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -54,7 +50,8 @@
 */
@Slf4j
@Service
public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO> implements EventVisitingTasksService {
public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO>
    implements EventVisitingTasksService {

    @Resource
    private EventVisitingTasksMapper eventVisitingTasksMapper;
@@ -77,11 +74,11 @@
     * @param eventVisitingTasksAddDTO
     * @return 新增结果
     */
    public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO){
    public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO) {
        EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
        BeanUtils.copyProperties(eventVisitingTasksAddDTO, eventVisitingTasksDO);
        eventVisitingTasksDO.setCreateAt(new Date());
        if(eventVisitingTasksMapper.insert(eventVisitingTasksDO)>0){
        if (eventVisitingTasksMapper.insert(eventVisitingTasksDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -89,14 +86,15 @@

    /**
     * 修改重点人群走访记录
     * 
     * @param eventVisitingTasksEditDTO
     * @return 维护结果
     */
    public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO){
    public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO) {
        EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
        BeanUtils.copyProperties(eventVisitingTasksEditDTO, eventVisitingTasksDO);
        //eventVisitingTasksDO.setUpdateAt(new Date());
        if(eventVisitingTasksMapper.updateById(eventVisitingTasksDO)>0){
        // eventVisitingTasksDO.setUpdateAt(new Date());
        if (eventVisitingTasksMapper.updateById(eventVisitingTasksDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -104,15 +102,16 @@

    /**
     * 分页查找重点人群走访记录
     * 
     * @param pageEventVisitingTasksDTO
     * @return 维护结果
     */
    public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO){
        Page page = new Page(1,10);
        if(pageEventVisitingTasksDTO.getPageNum()!=null) {
    public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO) {
        Page page = new Page(1, 10);
        if (pageEventVisitingTasksDTO.getPageNum() != null) {
            page.setCurrent(pageEventVisitingTasksDTO.getPageNum());
        }
        if(pageEventVisitingTasksDTO.getPageSize()!=null) {
        if (pageEventVisitingTasksDTO.getPageSize() != null) {
            page.setSize(pageEventVisitingTasksDTO.getPageSize());
        }
        return R.ok();
@@ -124,24 +123,28 @@
     * @param EventVisitingTasksDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){
    public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO) {
        return R.fail();
    }

    /**
     * 查询重点人群走访记录详细信息
     *
     * @param id 重点人群走访记录 id
     * @param id
     *            重点人群走访记录 id
     * @return 查找结果
     */
    public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id){
    public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO!=null) {
        if (eventVisitingTasksDO != null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            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
                .setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
            eventVisitingTasksDetailsVO
                .setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
            eventVisitingTasksDetailsVO
                .setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
@@ -150,7 +153,7 @@
    @Override
    public R count(Long communityId) {

        Map<String,Long> countMap = eventVisitingTasksMapper.count(communityId);
        Map<String, Long> countMap = eventVisitingTasksMapper.count(communityId);
        EventVisitCountVO eventVisitCountVO = new EventVisitCountVO();
        eventVisitCountVO.setVisit(countMap.get("visit"));
        eventVisitCountVO.setVisited(countMap.get("visited"));
@@ -159,24 +162,28 @@
    }

    @Override
    public R taskList(EventTasksQuery query) throws Exception{
    public R taskList(EventTasksQuery query) throws Exception {

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

    @Override
    public R appTaskList(EventTasksQuery query) throws Exception{
    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()));
        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()));
            }
        }
        return R.ok(page);
@@ -186,10 +193,10 @@
    @Override
    public R delete(IdDTO idDTO, Long communityId) {
        String[] ids = idDTO.getId().split(",");
        for(String id:ids){
        for (String id : ids) {
            EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
            if(eventVisitingTasksDO != null){
                if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
            if (eventVisitingTasksDO != null) {
                if (!Objects.equals(eventVisitingTasksDO.getEventStatus(), EventTasksStatusEnum.DZF.getCode())) {
                    return R.fail("您选择的走访任务中有已走访的不可删除");
                }
                eventVisitingTasksMapper.deleteById(id);
@@ -200,11 +207,11 @@

    private String toDelete(Long id) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO == null){
            return "["+id+"]数据不存在;";
        if (eventVisitingTasksDO == null) {
            return "[" + id + "]数据不存在;";
        }
        if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
            return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
        if (!Objects.equals(eventVisitingTasksDO.getEventStatus(), EventTasksStatusEnum.DZF.getCode())) {
            return "[" + eventVisitingTasksDO.getVisiterName() + "]状态不可删除;";
        }
        eventVisitingTasksMapper.deleteById(id);
        return null;
@@ -212,10 +219,13 @@

    @Override
    public R visitorList(EventVisitListQuery query) {
        IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
        page.getRecords().stream().forEach(e->{
            List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id").last("limit 0,1"));
            if(!CollectionUtils.isEmpty(list)){
        IPage<EventVisitListVO> page =
            eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(), query.getPageSize()), query);
        page.getRecords().stream().forEach(e -> {
            List<EventVisitingTasksDO> list =
                eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id", e.getId())
                    .orderByDesc("id").last("limit 0,1"));
            if (!CollectionUtils.isEmpty(list)) {
                e.setCreateAt(list.get(0).getCreateAt());
                e.setEventStatus(list.get(0).getEventStatus());
            }
@@ -225,30 +235,37 @@

    @Override
    public R list(EventTasksQuery query) {
        IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<AppVisitTasksVO> page =
            eventVisitingTasksMapper.list(new Page(query.getPageNum(), query.getPageSize()), query);
        return R.ok(page);
    }

    @Override
    public R detail(Long id) throws Exception {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO!=null) {
        if (eventVisitingTasksDO != null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
                eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
                eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
            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){
            eventVisitingTasksDetailsVO
                .setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            if (jsonObject != null && jsonObject.get("check") != null) {
                eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
            }

            //查询资源文件
            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
                .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);
        }
@@ -259,72 +276,72 @@
    @Override
    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("网格员不存在");
//        }
        // 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)){
        for (String idstr : id) {
            if (StringUtils.isEmpty(idstr)) {
                continue;
            }
            String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
            if(!StringUtils.isEmpty(error)){
            String error = addVisitingTask(Long.valueOf(idstr), idDTO.getGridId(), userId);
            if (!StringUtils.isEmpty(error)) {
                rt.append(error);
            }
        }
        if(!StringUtils.isEmpty(rt)){
            return R.fail("部分新增失败"+rt.toString());
        if (!StringUtils.isEmpty(rt)) {
            return R.fail("部分新增失败" + rt.toString());
        }
        return R.ok();
    }

    @Override
    public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception {
        IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<EventVisitingTasksVO> page =
            eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
        return page.getRecords();
    }

    private String addVisitingTask(Long id, Long gridId,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)){
            return "被访问人ID["+id+"]不存在;";
        Map<String, Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if (CollectionUtils.isEmpty(map)) {
            return "被访问人ID[" + id + "]不存在;";
        }

        Integer count = eventVisitingTasksMapper.countNoneComplete(id);
        if(count > 0){
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        if (count > 0) {
            return "被访问人[" + map.get("name") + "]只能同时存在一条待走访任务;";
        }



        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridId(gridId);
        //查询网格
        // 查询网格
        EventGridDataDO gridDataDO = eventGridDataMapper.selectById(gridId);
        if(gridDataDO != null){
        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()));
//        visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
//        visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
        // visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
        // visitingTasksDO.setGridMemberCommunity(communityId);
        // visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
        // visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
        // visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
        visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
        visitingTasksDO.setVisiterName(map.get("name").toString());
        visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
        visitingTasksDO.setVisiterTele(map.get("phone") == null ?null:map.get("phone").toString());
        visitingTasksDO.setVisiterTele(map.get("phone") == null ? null : map.get("phone").toString());
        StringBuilder sb = new StringBuilder();
        sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
        sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor"))
            .append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
        visitingTasksDO.setVisiterAddress(sb.toString());
        visitingTasksDO.setVisiterType(0);
        visitingTasksDO.setActOpara(0);
        if(map.get("lat") != null && map.get("lng") != null){
            visitingTasksDO.setHappentLatLng(map.get("lat")+","+map.get("lng"));
        if (map.get("lat") != null && map.get("lng") != null) {
            visitingTasksDO.setHappentLatLng(map.get("lat") + "," + map.get("lng"));
        }
        visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
        visitingTasksDO.setReporting(0);
@@ -332,13 +349,14 @@
        visitingTasksDO.setUrgent(false);
        visitingTasksDO.setUrgentDell(false);
        visitingTasksDO.setCreateBy(userId);
        visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null?null:Integer.valueOf(map.get("out_or_local").toString()));
        visitingTasksDO.setOutOrLocal(
            map.get("out_or_local") == null ? null : Integer.valueOf(map.get("out_or_local").toString()));

        if(map.get("label") != null){
        if (map.get("label") != null) {
            List<String> option = getOption(map.get("label").toString());
            if(!CollectionUtils.isEmpty(option)){
            if (!CollectionUtils.isEmpty(option)) {
                JSONObject json = new JSONObject();
                json.put("option",option);
                json.put("option", option);
                visitingTasksDO.setTableContentJson(json.toJSONString());
            }
        }
@@ -349,7 +367,7 @@

    private List<String> getOption(String label) {
        List<String> option = new ArrayList<>();
        if(!Objects.isNull(label)) {
        if (!Objects.isNull(label)) {
            if (label.contains("精神障碍")) {
                option.add("精神障碍异常1");
                option.add("精神障碍异常2");
@@ -381,11 +399,12 @@
    public R cancel(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
        if (eventVisitingTasksDO == null
            || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
            return R.fail("当前状态不可撤销");
        }
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
        if(rt > 0){
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(), 5);
        if (rt > 0) {
            return R.ok();
        }
        return R.fail();
@@ -396,11 +415,12 @@
    public R reset(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
        if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5) {
            return R.fail("当前状态不可恢复");
        }
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
        if(rt > 0){
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),
            EventTasksStatusEnum.DZF.getCode());
        if (rt > 0) {
            return R.ok();
        }
        return R.fail();
@@ -408,22 +428,23 @@

    @Transactional(rollbackFor = Exception.class)
    @Override
    public synchronized R start(Long id,Long userId) {
    public synchronized R start(Long id, Long userId) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
        if (eventVisitingTasksDO == null
            || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
            return R.fail("当前状态不可开始走访");
        }
        Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId);
        Map<String, Object> map = eventVisitingTasksMapper.findUserById(userId);
        EventVisitingTasksDO start = new EventVisitingTasksDO();
        start.setId(id);
        start.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
        start.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
        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.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString());
        start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
        int rt = eventVisitingTasksMapper.start(start);
        if(rt > 0){
        if (rt > 0) {
            return R.ok();
        }
        return R.fail();
@@ -433,63 +454,63 @@
    @Override
    public R complete(EventVisitCompleteDTO taskCompleteDTO) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId());
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
        if (eventVisitingTasksDO == null
            || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
            return R.fail("当前状态不可完成走访");
        }

        //查询当前人员是否是(精神障碍,吸毒,刑满释放,社区矫正),如果是这四种状态，option参数为必填参数
        // 查询当前人员是否是(精神障碍,吸毒,刑满释放,社区矫正),如果是这四种状态，option参数为必填参数
        String label = this.baseMapper.getPopulationLabel(eventVisitingTasksDO.getVisiterId());
        if(StringUtils.isNotEmpty(label)){
            if(label.contains("精神障碍") || label.contains("吸毒") || label.contains("刑满释放") || label.contains("社区矫正")){
                if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
        if (StringUtils.isNotEmpty(label)) {
            if (label.contains("精神障碍") || label.contains("吸毒") || label.contains("刑满释放") || label.contains("社区矫正")) {
                if (StringUtils.isNotEmpty(taskCompleteDTO.getOption())) {
                    return R.fail("请选择异常状态");
                }
            }
        }

        EventVisitingTasksDO complete = new EventVisitingTasksDO();
        BeanUtils.copyProperties(taskCompleteDTO,complete);
        BeanUtils.copyProperties(taskCompleteDTO, complete);
        complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());

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

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

        Map<String,Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId());
        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());
        complete.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString());

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


    private void createResource(Long id, Long dellUserId, int classification, int type, EventResourceDTO resourceDTO) {
        EventResourceDO eventResourceDO = new EventResourceDO();
@@ -504,13 +525,10 @@

    @Override
    public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
        List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>();
        List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList(
                new QueryWrapper<EventVisitingTasksDO>()
                        .eq("lc_upload", false)
                        .eq("event_status",2)
        );
        lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class);
        List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList = new ArrayList<>();
        List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper
            .selectList(new QueryWrapper<EventVisitingTasksDO>().eq("lc_upload", false).eq("event_status", 2));
        lcEventVisitingTasksList = CopyUtil.beanCopyList(eventVisitingTasksList, LcEventVisitingTasksListDTO.class);
        lcEventVisitingTasksList.forEach(visitingTasks -> {
            addVisitingTasksFile(visitingTasks);
        });
@@ -518,12 +536,10 @@
    }

    private LcEventVisitingTasksListDTO addVisitingTasksFile(LcEventVisitingTasksListDTO visitingTasks) {
        //查询事件关联附件
        // 查询事件关联附件
        List<EventResourceDO> eventResourceDOList =
                eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                        .eq(EventResourceDO::getClassification, 2)
                        .eq(EventResourceDO::getRefId, visitingTasks.getId())
                );
            eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                .eq(EventResourceDO::getClassification, 2).eq(EventResourceDO::getRefId, visitingTasks.getId()));
        List<EventResourceVO> picList = new ArrayList<>();
        List<EventResourceVO> audioList = new ArrayList<>();
        List<EventResourceVO> videoList = new ArrayList<>();