bug修复

huanghongfa

2021-09-29 d97c26f44fe7faa9ab2a2ec3b73d7b0f49140d27

bug修复

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java

@@ -213,4 +213,13 @@
     * 是否已经上传浪潮服务器市平台
     */
    private Boolean lcUpload;

    /**
     * 是否有异常枚举(1.是  0.否)
     */
    public interface exception{
        int yes = 1;
        int no = 0;

    }
}

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

@@ -396,6 +396,7 @@
                option.add("社区矫正异常3");
                option.add("社区矫正异常4");
            }
            option.add("无异常");
        }
        return option;
    }
@@ -469,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("请选择异常状态");
//                }
            }
        }