修改bug

huanghongfa

2021-07-08 aba489c74e27e36ece27c5e1b8f591560775cf90

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

@@ -231,11 +231,19 @@
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            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.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));

            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
@@ -397,7 +405,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();
@@ -425,11 +433,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());
@@ -450,7 +455,7 @@
            });
        }
        if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
            taskCompleteDTO.getVosList().forEach(e->{
            taskCompleteDTO.getVideoList().forEach(e->{
                createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e);
            });
        }
@@ -462,7 +467,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();
        }