Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

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

@@ -84,6 +84,7 @@
        if(Objects.isNull(hiddenDangerParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患区域");
        }

        HiddenDangerParam hiddenDangerCate = hiddenDangerParamMapper.selectById(hiddenDanger.getCateId());
        if(Objects.isNull(hiddenDangerCate)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患类型");
@@ -123,7 +124,7 @@
                multifileMapper.insert(multifile);
            }
        }
        String title = "[隐患随手拍]提报人-"+hiddenDanger.getLoginUserInfo().getRealname();
        String title = "【隐患随手拍】提报人 - "+hiddenDanger.getLoginUserInfo().getRealname();
        //json数据
        Map<String,Object> jsonMap = new HashMap<>();
        jsonMap.put("area", "发现区域:" + hiddenDangerParam.getName());
@@ -143,7 +144,7 @@
        createNotices.setSendacopy(Constants.ZERO);
        createNotices.setParam2("0");
        createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
        createNotices.setInfo("处理中");
        createNotices.setInfo("待 "+member.getName()+" 处理");
        noticesJoinMapper.insert(createNotices);

        //存储处理人的通知消息
@@ -162,6 +163,7 @@
        notices.setStatus(Constants.ZERO);
        notices.setSendacopy(Constants.ZERO);
        notices.setReaded(Constants.ZERO);
        notices.setInfo("待 "+member.getName()+" 处理");
        noticesJoinMapper.insert(notices);


@@ -317,6 +319,7 @@
                .eq(pageWrap.getModel().getCheckInfo() != null, HiddenDanger::getCheckInfo, pageWrap.getModel().getCheckInfo())
                .eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
                .eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
                .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName())

                .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                        .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
@@ -448,7 +451,7 @@
            }
        }
        if(fileList.size()>0){
            multifileMapper.insertBatchSomeColumn(fileList);
            multifileMapper.insert(fileList);
        }
    }

@@ -509,12 +512,15 @@
            BeanUtils.copyProperties(notices,newNotices);
            newNotices.setId(null);
            newNotices.setCreateDate(new Date());
            newNotices.setParam2("3");
            newNotices.setParam2("0");
            newNotices.setUserId(hiddenDanger.getCheckUserId());
            newNotices.setInfo("待 "+member.getName()+" 处理");
            noticesJoinMapper.insert(newNotices);
            notices.setStatus(Constants.ONE);
            notices.setParam2("3");
            notices.setEditDate(new Date());
            notices.setReaded(Constants.ONE);
            notices.setInfo("待 "+member.getName()+" 处理");
            noticesJoinMapper.updateById(notices);
        }
    }