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

huanghongfa

2021-06-28 3c917ce09089dda25db584f31e7f44527d4be455

 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;
@@ -193,6 +194,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"));
            if(!CollectionUtils.isEmpty(list)){
                e.setCreateAt(list.get(0).getCreateAt());
                e.setEventStatus(list.get(0).getEventStatus());
            }
        });
        return R.ok(page);
    }

@@ -208,7 +216,11 @@
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
            eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            if(jsonObject != null && jsonObject.get("check") != null){
                eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
            }
            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
@@ -216,12 +228,12 @@

    @Transactional(rollbackFor = Exception.class)
    @Override
    public R add(String ids, Long communityId, Long userId) throws Exception {
    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("网格员不存在");
        }
        String[] id = ids.split(",");
        String[] id = idDTO.getId().split(",");
        for(String idstr:id){
            if(StringUtils.isEmpty(idstr)){
                continue;
@@ -237,8 +249,6 @@
        IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
        return page.getRecords();
    }



    private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{

@@ -259,9 +269,7 @@
        visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
        visitingTasksDO.setVisiterName(map.get("name").toString());
        visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
        if(map.get("phone") != null){
            visitingTasksDO.setVisiterTele(AESUtil.decrypt128(map.get("phone").toString(),aesKey));
        }
        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("号");
        visitingTasksDO.setVisiterAddress(sb.toString());