Merge branch 'master' into master-手术随访

陈昶聿

昨天 cc3fe1ad9b366533d184d9e239b45f731f014e74

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java

@@ -2,10 +2,11 @@

import java.util.List;

import com.ruoyi.common.core.domain.DingTalkReqVo;
import com.ruoyi.common.core.service.IDingTalkService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.ReportReqVo;
import com.smartor.domain.DingTalkReqVo;
import com.smartor.service.DingTalkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.EquipmentinfoMapper;
@@ -23,8 +24,7 @@
    @Autowired
    private EquipmentinfoMapper equipmentinfoMapper;

    @Autowired
    private DingTalkService dingTalkService;



    /**
@@ -119,6 +119,7 @@
            dingTalkReqVo.setContents(null);
            dingTalkReqVo.setDeptId(Long.valueOf(reportReqVo.getDealDeptID()));
            dingTalkReqVo.setUserId(reportReqVo.getDealPersionDingNO());
            IDingTalkService dingTalkService = SpringUtils.getBean(IDingTalkService.class);
            aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
        }