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/controller/SafeHazardController.java
@@ -50,7 +50,7 @@ @ApiOperation("删除危险源台账") @DeleteMapping("/{ids}") public R delSafeHazard(@RequestBody List<Integer> ids) { return R.ok(safeHazardService.removeBatchByIds(ids)); return R.ok(safeHazardService.delSafeHazard(ids)); } } src/main/java/com/ruoyi/safe/service/SafeHazardService.java
@@ -5,6 +5,8 @@ import com.ruoyi.safe.pojo.SafeHazard; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** * <p> * 安全生产--危险源台账 服务类 @@ -16,4 +18,6 @@ public interface SafeHazardService extends IService<SafeHazard> { IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard); int delSafeHazard(List<Integer> ids); } src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
@@ -1,13 +1,18 @@ package com.ruoyi.safe.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.safe.mapper.SafeHazardRecordMapper; import com.ruoyi.safe.pojo.SafeHazard; import com.ruoyi.safe.mapper.SafeHazardMapper; import com.ruoyi.safe.pojo.SafeHazardRecord; import com.ruoyi.safe.service.SafeHazardService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -23,8 +28,24 @@ @Autowired private SafeHazardMapper safeHazardMapper; @Autowired private SafeHazardRecordMapper safeHazardRecordMapper; @Override public IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard) { return safeHazardMapper.pageSafeHazard(page, safeHazard); } @Override public int delSafeHazard(List<Integer> ids) { //判断是否有正在领用的危险源 List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectList(Wrappers.<SafeHazardRecord>lambdaQuery() .in(SafeHazardRecord::getSafeHazardId, ids) .isNull(SafeHazardRecord::getReturnUserId)); if (safeHazardRecords.size()>0){ throw new RuntimeException("该危险源已经领用,无法删除,等归还之后再进行删除!"); } safeHazardMapper.deleteBatchIds(ids); return 0; } } 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());
