最新版本541200007

jiangping

2024-12-30 3af254f1b36e7722673fcebe110da524b276105c

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

@@ -18,9 +18,11 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.MultifileMapper;

import com.doumee.dao.system.SystemUserMapper;
@@ -210,7 +212,6 @@
        hiddenDanger.setMemberName(systemUser.getRealname());
        //提交人的微信公众号通知
        if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){

            wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
                    wxNoticeConfigMapper,hiddenDanger,
                    WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -222,10 +223,9 @@
                .eq(SystemUser::getDeleted, Constants.ZERO)
                .eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId())
                .last(" limit 1 "));

        //处理人的微信公众号通知
        if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){


            wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
                    wxNoticeConfigMapper,hiddenDanger,
                    WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -426,8 +426,6 @@
        return hiddenDangerMapper.selectCount(wrapper);
    }



    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void dealHiddenDanger(HiddenDanger hiddenDanger){
@@ -605,6 +603,7 @@
        if(Objects.isNull(hiddenDangerCate)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患类型");
        }
        model.setCategoryName(hiddenDangerCate.getName());
        hiddenDanger.setCategoryName(hiddenDangerCate.getName());
        hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
        hiddenDanger.setEditDate(new Date());
@@ -625,6 +624,7 @@
                .eq(Notices::getObjId,hiddenDanger.getId())
                .eq(Notices::getObjType,Constants.THREE)
                .eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
                .orderByDesc(Notices::getId)
                .last(" limit  1 ")
        );
        if(Objects.nonNull(notices)){
@@ -651,6 +651,7 @@
          return;
        }
        hiddenDanger.setMemberName(memberUser.getRealname());
        model.setMemberName(memberUser.getRealname());
        SystemUser checkUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted, Constants.ZERO)
                .eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
@@ -667,7 +668,7 @@
        if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
            WxPlatNotice wxPlatNotice = new WxPlatNotice();
            wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
                    wxNoticeConfigMapper,hiddenDanger,
                    wxNoticeConfigMapper,model,
                    WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
                    systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                    Arrays.asList(checkUser.getOpenid().split(",")));