From 5cd202ceda68a475708a6330ba935314715f72d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Mon, 22 Sep 2025 15:32:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AE=89=E5=85=A8=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E3=80=81=E5=A2=9E=E5=8A=A0=E9=A2=98=E5=BA=93=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bo/req/WgzAppSubmitATestPaperReq.java | 5 + .../HseSafetyInspectionController.java | 3 +- .../controller/WgzQuestionSaveController.java | 106 ++++++++++-------- .../safety/domain/WgzQuestionSave.java | 2 + .../safety/domain/WgzQuestionSavePdf.java | 3 + .../domain/bo/WgzQuestionSavePdfBo.java | 8 ++ .../domain/vo/WgzQuestionSavePdfVo.java | 18 ++- .../impl/HseSafetyInspectionServiceImpl.java | 2 +- .../impl/WgzQuestionSavePdfServiceImpl.java | 11 ++ .../impl/WgzQuestionSaveServiceImpl.java | 2 + 10 files changed, 110 insertions(+), 50 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/bo/req/WgzAppSubmitATestPaperReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/bo/req/WgzAppSubmitATestPaperReq.java index 21b8e138..a492e696 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/bo/req/WgzAppSubmitATestPaperReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/bo/req/WgzAppSubmitATestPaperReq.java @@ -14,6 +14,11 @@ import java.util.List; @Accessors(chain = true) public class WgzAppSubmitATestPaperReq implements Serializable { + /** + * 项目ID + */ + private Long projectId; + /** * 务工者唯一标识 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java index 811d98c5..b5b1845c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java @@ -51,7 +51,8 @@ public class HseSafetyInspectionController extends BaseController { @SaCheckPermission("safety:safetyInspection:list") @GetMapping("/list") public TableDataInfo list(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { - return safetyInspectionService.queryPageList(req, pageQuery); +// return safetyInspectionService.queryPageList(req, pageQuery); + return safetyInspectionService.queryPageListWeb(req, pageQuery); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java index 01ecd070..f9456baf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java @@ -15,7 +15,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.safety.domain.WgzQuestionSave; import org.dromara.safety.domain.bo.WgzQuestionSaveBo; +import org.dromara.safety.domain.bo.WgzQuestionSavePdfBo; +import org.dromara.safety.domain.vo.WgzQuestionSavePdfVo; import org.dromara.safety.domain.vo.WgzQuestionSaveVo; +import org.dromara.safety.service.IWgzQuestionSavePdfService; import org.dromara.safety.service.IWgzQuestionSaveService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -33,57 +36,66 @@ public class WgzQuestionSaveController extends BaseController { private final IWgzQuestionSaveService iWgzQuestionSaveService; + private final IWgzQuestionSavePdfService iwgzQuestionSavePdfService; + /** * 查询用户试卷存储列表 */ - @SaCheckPermission("safety:wgzQuestionSave:list") - @GetMapping("/list") - public TableDataInfo list(@Validated WgzQuestionSaveBo bo, PageQuery pageQuery) { - return iWgzQuestionSaveService.queryPageList(bo,pageQuery); + @SaCheckPermission("safety:wgzQuestionSave:listPdf") + @GetMapping("/listPdf") + public TableDataInfo list(@Validated WgzQuestionSavePdfBo bo, PageQuery pageQuery) { + return iwgzQuestionSavePdfService.queryPageList(bo,pageQuery); } +// /** +// * 查询用户试卷存储列表 +// */ +// @SaCheckPermission("safety:wgzQuestionSave:list") +// @GetMapping("/list") +// public TableDataInfo list(@Validated WgzQuestionSaveBo bo, PageQuery pageQuery) { +// return iWgzQuestionSaveService.queryPageList(bo,pageQuery); +// } - - /** - * 获取用户试卷存储详细信息 - */ - @SaCheckPermission("safety:wgzQuestionSave:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return R.ok(iWgzQuestionSaveService.queryById(id)); - } - - /** - * 新增用户试卷存储 - */ - @SaCheckPermission("safety:wgzQuestionSave:add") - @Log(title = "用户试卷存储", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated @RequestBody WgzQuestionSave bo) { - return toAjax(iWgzQuestionSaveService.insert(bo) ? 1 : 0); - } - - /** - * 修改用户试卷存储 - */ - @SaCheckPermission("safety:wgzQuestionSave:edit") - @Log(title = "用户试卷存储", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated @RequestBody WgzQuestionSave bo) { - return toAjax(iWgzQuestionSaveService.update(bo) ? 1 : 0); - } - - /** - * 删除用户试卷存储 - */ - @SaCheckPermission("safety:wgzQuestionSave:remove") - @Log(title = "用户试卷存储", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(iWgzQuestionSaveService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); - } +// /** +// * 获取用户试卷存储详细信息 +// */ +// @SaCheckPermission("safety:wgzQuestionSave:query") +// @GetMapping("/{id}") +// public R getInfo(@NotNull(message = "主键不能为空") +// @PathVariable("id") Long id) { +// return R.ok(iWgzQuestionSaveService.queryById(id)); +// } +// +// /** +// * 新增用户试卷存储 +// */ +// @SaCheckPermission("safety:wgzQuestionSave:add") +// @Log(title = "用户试卷存储", businessType = BusinessType.INSERT) +// @RepeatSubmit() +// @PostMapping() +// public R add(@Validated @RequestBody WgzQuestionSave bo) { +// return toAjax(iWgzQuestionSaveService.insert(bo) ? 1 : 0); +// } +// +// /** +// * 修改用户试卷存储 +// */ +// @SaCheckPermission("safety:wgzQuestionSave:edit") +// @Log(title = "用户试卷存储", businessType = BusinessType.UPDATE) +// @RepeatSubmit() +// @PutMapping() +// public R edit(@Validated @RequestBody WgzQuestionSave bo) { +// return toAjax(iWgzQuestionSaveService.update(bo) ? 1 : 0); +// } +// +// /** +// * 删除用户试卷存储 +// */ +// @SaCheckPermission("safety:wgzQuestionSave:remove") +// @Log(title = "用户试卷存储", businessType = BusinessType.DELETE) +// @DeleteMapping("/{ids}") +// public R remove(@NotEmpty(message = "主键不能为空") +// @PathVariable Long[] ids) { +// return toAjax(iWgzQuestionSaveService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); +// } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSave.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSave.java index e597771b..d694281f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSave.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSave.java @@ -62,4 +62,6 @@ public class WgzQuestionSave extends BaseEntity { /** 备注 */ private String remark; + /** 项目ID */ + private Long projectId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSavePdf.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSavePdf.java index 8f18ad76..a67ea579 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSavePdf.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/WgzQuestionSavePdf.java @@ -53,4 +53,7 @@ public class WgzQuestionSavePdf extends BaseEntity { /** 总得分 */ private Double sumScore; + /** 项目ID */ + private Long projectId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionSavePdfBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionSavePdfBo.java index 75b0320e..bb6f34ff 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionSavePdfBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionSavePdfBo.java @@ -20,12 +20,20 @@ import jakarta.validation.constraints.*; @AutoMapper(target = WgzQuestionSavePdf.class, reverseConvertGenerate = false) public class WgzQuestionSavePdfBo extends BaseEntity { + /** * 主键iD */ @NotNull(message = "主键iD不能为空", groups = { EditGroup.class }) private Long id; + + /** + * 项目ID + */ + @NotBlank(message = "项目Id", groups = { EditGroup.class }) + private Long projectId; + /** * 1线上 2线下 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/WgzQuestionSavePdfVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/WgzQuestionSavePdfVo.java index 58ef688f..ea4b8ef1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/WgzQuestionSavePdfVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/WgzQuestionSavePdfVo.java @@ -1,5 +1,7 @@ package org.dromara.safety.domain.vo; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.safety.domain.WgzQuestionSavePdf; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -46,12 +48,26 @@ public class WgzQuestionSavePdfVo implements Serializable { @ExcelProperty(value = "用户主键ID") private Long userId; + /** + * 用户名 + */ + @ExcelProperty(value = "用户名") + private String userName; + + /** * pdf路径 */ - @ExcelProperty(value = "pdf路径") + @ExcelProperty(value = "pdf路径(ID)") private String path; + /** + * pdf路径 + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "pathUrl") + @ExcelProperty(value = "pdf路径(URL)") + private String pathUrl; + /** * 及格线/总分（格式：60,100） */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 0b471179..8f6ef68e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -145,7 +145,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl queryPageListWeb(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { LambdaQueryWrapper lqw = this.buildQueryWrapper(req); - Long userId = LoginHelper.getUserId(); +// Long userId = LoginHelper.getUserId(); // if (userId != null) { // BusProjectTeamMember one = projectTeamMemberService.lambdaQuery() // .eq(BusProjectTeamMember::getMemberId, userId) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSavePdfServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSavePdfServiceImpl.java index 1cd7f113..fa6c9ef7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSavePdfServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSavePdfServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.safety.domain.WgzQuestionSavePdf; @@ -12,6 +13,8 @@ import org.dromara.safety.domain.bo.WgzQuestionSavePdfBo; import org.dromara.safety.domain.vo.WgzQuestionSavePdfVo; import org.dromara.safety.mapper.WgzQuestionSavePdfMapper; import org.dromara.safety.service.IWgzQuestionSavePdfService; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysUserService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -29,6 +32,9 @@ import java.util.Collection; @Service public class WgzQuestionSavePdfServiceImpl extends ServiceImpl implements IWgzQuestionSavePdfService { + @Resource + private ISysUserService userService; + @Override public WgzQuestionSavePdf queryById(Long id){ return getById(id); @@ -38,6 +44,11 @@ public class WgzQuestionSavePdfServiceImpl extends ServiceImpl queryPageList(WgzQuestionSavePdfBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + // 根据id获取到用户名 + result.getRecords().forEach(item -> { + SysUserVo sysUserVo = userService.selectUserById(item.getUserId()); + item.setUserName(sysUserVo.getNickName()); + }); return TableDataInfo.build(result); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSaveServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSaveServiceImpl.java index bfa8c706..17bc9847 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSaveServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/WgzQuestionSaveServiceImpl.java @@ -206,6 +206,7 @@ public class WgzQuestionSaveServiceImpl extends ServiceImpl