最新版本541200007

jiangping

2025-06-26 f116ffb8abf668cdd5a8d33bd2f85363fd1ef28d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -108,6 +108,7 @@
            || Objects.isNull(hiddenDanger.getCateId())
            || Objects.isNull(hiddenDanger.getApplyCheckUserId())
            || Objects.isNull(hiddenDanger.getCheckUserId())
            || Objects.isNull(hiddenDanger.getCheckTypeId())
            || Objects.isNull(hiddenDanger.getSubmitTime())
            || StringUtils.isBlank(hiddenDanger.getContent())
        ){
@@ -121,6 +122,10 @@
        hiddenDanger.setIsdeleted(Constants.ZERO);
        hiddenDanger.setCreateDate(new Date());
        hiddenDanger.setEditDate(new Date());
        HiddenDangerParam hiddenDangerCheckParam = hiddenDangerParamMapper.selectById(hiddenDanger.getCheckTypeId());
        if(Objects.isNull(hiddenDangerCheckParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患检查类型");
        }
        HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId());
        if(Objects.isNull(hiddenDangerParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患区域");
@@ -341,12 +346,14 @@
                .select("t2.name",HiddenDanger::getCheckorName)
                .select("t2.phone",HiddenDanger::getCheckorPhone)
                .select("t5.company_name_path",HiddenDanger::getDutyCompanyName)
                .select("t4.company_name_path",HiddenDanger::getCompanyName);
                .select("t4.company_name_path",HiddenDanger::getCompanyName)
                .select("t6.name", HiddenDanger::getCheckTypeName);
        queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin("company t4 on t1.company_id=t4.id")
                .leftJoin("company t5 on t2.company_id=t5.id");
                .leftJoin("company t5 on t2.company_id=t5.id")
                .leftJoin("hidden_danger_param t6 on t2.check_type_id=t6.id");
        queryWrapper
                .eq(HiddenDanger::getId, id)
                .eq(HiddenDanger::getIsdeleted, Constants.ZERO)
@@ -434,6 +441,7 @@
        queryWrapper.selectAll(HiddenDanger.class)
                .selectAs(HiddenDangerParam::getName,HiddenDanger::getCategoryName)
                .select("t1.name", HiddenDanger::getMemberName)
                .select("t6.name", HiddenDanger::getCheckTypeName)
                .select("t1.phone",HiddenDanger::getMemberPhone)
                .select("t2.name",HiddenDanger::getCheckorName)
                .select("t2.phone",HiddenDanger::getCheckorPhone)
@@ -443,6 +451,7 @@
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin("company t4 on t1.company_id=t4.id")
                .leftJoin("hidden_danger_param t6 on t2.check_type_id=t6.id")
                .leftJoin("company t5 on t2.company_id=t5.id");

        //数据权限开始--------------------start----------------