bug修复

huanghongfa

2021-10-08 a5ac35810343c19d1822b119e1dba427f1f95de3

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

@@ -241,22 +241,28 @@
    }

    @Override
    public R detail(Long id) throws Exception {
    public R detail(Long id){
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        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));
                try {
                    eventVisitingTasksDetailsVO
                            .setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
                    eventVisitingTasksDetailsVO
                            .setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
                }catch (Exception e){
                    log.error("手机号码转义失败");
                }
            }
            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());
            if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
                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());
                }
            }

            // 查询资源文件
@@ -390,6 +396,7 @@
                option.add("社区矫正异常3");
                option.add("社区矫正异常4");
            }
            option.add("无异常");
        }
        return option;
    }
@@ -463,9 +470,12 @@
        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(taskCompleteDTO.getException().equals(EventVisitingTasksDO.exception.yes) && StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
                    return R.fail("请选择异常状态");
                }
//                if (StringUtils.isNotEmpty(taskCompleteDTO.getOption())) {
//                    return R.fail("请选择异常状态");
//                }
            }
        }