lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

安全

Browse Source
This commit is contained in:
lcj
2025-11-25 09:42:28 +08:00
parent 04407d2f84
commit 1b2f9aa755
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java
View File

@ -42,7 +42,6 @@ public class HseSafetyInspectionController extends BaseController {
@SaCheckPermission("safety:safetyInspection:list")
@GetMapping("/list")
public TableDataInfo<HseSafetyInspectionVo> list(HseSafetyInspectionQueryReq req, PageQuery pageQuery) {
// return safetyInspectionService.queryPageList(req, pageQuery);
return safetyInspectionService.queryPageListWeb(req, pageQuery);
}
@ -60,7 +59,7 @@ public class HseSafetyInspectionController extends BaseController {
/**
* 根据主键导出安全巡检工单
*/
@SaCheckPermission("safety:safetyInspection:exportWord")
@SaCheckPermission("safety:safetyInspection:export")
@Log(title = "安全巡检工单", businessType = BusinessType.EXPORT)
@PostMapping("/export/word")
public void exportWordById(@NotNull(message = "主键不能为空") Long id,

41
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java
View File

@ -1,18 +1,21 @@
package org.dromara.safety.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberQueryReq;
import org.dromara.project.domain.vo.project.BusProjectContractorTeamListVo;
import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo;
import org.dromara.project.service.IBusProjectService;
import org.dromara.project.service.IBusProjectTeamMemberService;
import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingCreateReq;
import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingQueryReq;
import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingUpdateReq;
@ -37,6 +40,29 @@ public class HseTeamMeetingController extends BaseController {
private final IHseTeamMeetingService teamMeetingService;
private final IBusProjectService projectService;
private final IBusProjectTeamMemberService teamMemberService;
/**
* 根据 id 查询项目以及项目下的分包公司、班组列表
*/
@SaCheckPermission("safety:teamMeeting:add")
@GetMapping("/contractorTeamList/{id}")
public R<BusProjectContractorTeamListVo> listContractorListById(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(projectService.queryContractorTeamListById(id));
}
/**
* 查询项目班组下的成员列表
*/
@SaCheckPermission("safety:teamMeeting:add")
@GetMapping("/teamMember/list")
public TableDataInfo<BusProjectTeamMemberVo> list(BusProjectTeamMemberQueryReq req, PageQuery pageQuery) {
return teamMemberService.queryPageList(req, pageQuery);
}
/**
* 查询站班会列表
*/
@ -46,17 +72,6 @@ public class HseTeamMeetingController extends BaseController {
return teamMeetingService.queryPageList(req, pageQuery);
}
/**
* 导出站班会列表
*/
@SaCheckPermission("safety:teamMeeting:export")
@Log(title = "站班会", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HseTeamMeetingQueryReq req, HttpServletResponse response) {
List<HseTeamMeetingVo> list = teamMeetingService.queryList(req);
ExcelUtil.exportExcel(list, "站班会", HseTeamMeetingVo.class, response);
}
/**
* 获取站班会详细信息
*