Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

17 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.mapper.SysNoticeMapper;
import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.project.system.service.impl.SysNoticeServiceImpl;
import com.ruoyi.safe.dto.SafeHiddenDto;
@@ -38,6 +39,9 @@
    @Autowired
    private ISysNoticeService sysNoticeService;

    @Autowired
    private ISysDictDataService sysDictDataService;


    @Override
    public IPage<SafeHiddenDto> pageSafeHidden(Page page, SafeHiddenDto safeHiddenDto) {
@@ -51,12 +55,14 @@
        String no = "YH" + String.format("%s%03d", datePrefix, safeHidden.getId());
        safeHidden.setHiddenCode(no);
        safeHiddenMapper.updateById(safeHidden);
        //获取隐患类型的字典
        String type = sysDictDataService.selectDictLabel("hidden_danger_type", safeHidden.getType());
        //消息通知
        sysNoticeService.simpleNoticeByUser("隐患排查上报整改",
                "隐患类型："+safeHidden.getType()+"\n"+
                        "隐患风险等级："+safeHidden.getRiskLevel()+"\n"+
                        "隐患具体位置："+safeHidden.getLocation()+"\n"+
                        "隐患描述："+safeHidden.getHiddenDesc()+"\n"+
                "隐患类型："+type+"\t"+
                        "隐患风险等级："+safeHidden.getRiskLevel()+"\t"+
                        "隐患具体位置："+safeHidden.getLocation()+"\t"+
                        "隐患描述："+safeHidden.getHiddenDesc()+"\t"+
                        "整改完成期限(日期)："+safeHidden.getRectifyTime(),
                Arrays.asList(Long.valueOf(safeHidden.getRectifyUserId())),
                "/safeProduction/dangerInvestigation?id=" + safeHidden.getId());