危险作业审批导出接口404+隐患上报通知时，对应整改人通知消息中隐患类型展示信息有误

zss

13 小时以前 6678bdd59105458fbbba5fbb7cf6ce3614cc00b2

危险作业审批导出接口404+隐患上报通知时，对应整改人通知消息中隐患类型展示信息有误

 src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java

@@ -182,4 +182,14 @@
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "协同审批导出");
    }

    @ApiOperation(value = "危险作业审批导出")
    @PostMapping("/exportEight")
    public void exportEight(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 8));
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "危险作业审批导出");
    }
}

 src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java

@@ -43,7 +43,7 @@
        sealApplicationManagementService.save(sealApplicationManagement);
        //消息通知
        sysNoticeService.simpleNoticeByUser("用印审批",
                "申请编号："+sealApplicationManagement.getApplicationNum()+"\n"
                "申请编号："+sealApplicationManagement.getApplicationNum()+"\t"
                +"申请标题："+sealApplicationManagement.getTitle(),
                Arrays.asList(sealApplicationManagement.getApproveUserId()),
                "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());

 src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java

@@ -182,8 +182,8 @@
            if (!userIds.isEmpty()) {
                sysNoticeService.simpleNoticeByUser(
                        "会议通知",
                        "会议主题：" + application.getTitle() + "\n" +
                                "会议时间：" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
                        "会议主题：" + application.getTitle() + "\t" +
                                "会议时间：" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
                                "发起人：" + application.getApplicant(),
                        userIds,
                        ""

 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());