From 3371ef9c1c5be6bb0d52cac2f7ba7713074ebf29 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Tue, 30 Sep 2025 16:59:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractor/SubContractorCreateReq.java | 1 - .../PgsProgressPlanDetailServiceImpl.java | 8 ++-- .../QltQualityInspectionController.java | 14 ++----- .../HseSafetyInspectionController.java | 9 ----- .../safety/domain/bo/WgzQuestionBankBo.java | 11 +++--- .../domain/bo/WgzQuestionSavePdfBo.java | 26 +++++++++---- .../impl/HseSafetyInspectionServiceImpl.java | 7 +++- .../impl/WgzQuestionSavePdfServiceImpl.java | 39 +++++++++++++++++++ 8 files changed, 75 insertions(+), 40 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java index 7645877e..07766570 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java @@ -33,7 +33,6 @@ public class SubContractorCreateReq implements Serializable { /** * 供应商id */ - @NotNull(message = "供应商不能为空") private Long supplierId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java index cb64e2f0..b3f3b5ae 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java @@ -167,8 +167,8 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl testAdd(QltQualityInspectionUpdateFileReq req) { - QltQualityInspection qualityInspection = new QltQualityInspection(); - BeanUtils.copyProperties(req, qualityInspection); - return R.ok(qualityInspectionService.updateById(qualityInspection)); - } - /** * 查询质量-检查工单列表 */ 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 b5b1845c..1cea6a1c 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 @@ -13,12 +13,10 @@ 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.safety.domain.HseSafetyInspection; import org.dromara.safety.domain.dto.safetyinspection.*; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo; import org.dromara.safety.service.IHseSafetyInspectionService; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,13 +36,6 @@ public class HseSafetyInspectionController extends BaseController { private final IHseSafetyInspectionService safetyInspectionService; - @PutMapping("/test/add") - public R testAdd(@Validated @RequestBody HseSafetyInspectionUpdateFileReq req) { - HseSafetyInspection inspection = new HseSafetyInspection(); - BeanUtils.copyProperties(req, inspection); - return R.ok(safetyInspectionService.updateById(inspection)); - } - /** * 查询安全巡检工单列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionBankBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionBankBo.java index 09f7ab67..14812306 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionBankBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/WgzQuestionBankBo.java @@ -1,13 +1,12 @@ package org.dromara.safety.domain.bo; -import org.dromara.safety.domain.WgzQuestionBank; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.safety.domain.WgzQuestionBank; /** * 题库业务对象 wgz_question_bank @@ -23,7 +22,7 @@ public class WgzQuestionBankBo extends BaseEntity { /** * 主键ID */ - @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键ID不能为空", groups = {EditGroup.class}) private Long id; /** 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 bb6f34ff..707997c3 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 @@ -1,13 +1,13 @@ package org.dromara.safety.domain.bo; -import org.dromara.safety.domain.WgzQuestionSavePdf; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.safety.domain.WgzQuestionSavePdf; /** * 用户试卷存储pdf业务对象 wgz_question_save_pdf @@ -24,22 +24,32 @@ public class WgzQuestionSavePdfBo extends BaseEntity { /** * 主键iD */ - @NotNull(message = "主键iD不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键iD不能为空", groups = {EditGroup.class}) private Long id; /** * 项目ID */ - @NotBlank(message = "项目Id", groups = { EditGroup.class }) + @NotBlank(message = "项目Id", groups = {EditGroup.class}) private Long projectId; /** * 1线上 2线下 */ - @NotBlank(message = "1线上 2线下不能为空", groups = { EditGroup.class }) + @NotBlank(message = "1线上 2线下不能为空", groups = {EditGroup.class}) private String type; + /** + * 用户名称 + */ + private String userName; + + /** + * 班组id + */ + private Long teamId; + /** * 用户主键ID */ 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 5cc95743..d62df921 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 @@ -27,7 +27,6 @@ import org.dromara.common.utils.DocumentUtil; import org.dromara.contractor.domain.SubContractor; import org.dromara.contractor.service.ISubContractorService; import org.dromara.project.domain.BusProjectTeam; -import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.project.service.IBusProjectTeamService; @@ -127,7 +126,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { LambdaQueryWrapper lqw = this.buildQueryWrapper(req); - lqw.eq(req.getCorrectorId()!= null, HseSafetyInspection::getCorrectorId, req.getCorrectorId()); + lqw.eq(req.getCorrectorId() != null, HseSafetyInspection::getCorrectorId, req.getCorrectorId()); lqw.eq(req.getCreateBy() != null, HseSafetyInspection::getCreateBy, req.getCreateBy()); // Long userId = LoginHelper.getUserId(); // if (userId != null) { @@ -242,6 +241,10 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(WgzQuestionSavePdf::getId); lqw.orderByDesc(WgzQuestionSavePdf::getType); + // 关联查询用户名称 + String userName = bo.getUserName(); + if (StringUtils.isNotBlank(userName)) { + List userIds = userService.selectUserListByNikeName(userName) + .stream() + .map(SysUserVo::getUserId) + .distinct() + .toList(); + // 如果 userIds 为空，就用一个不会命中的值填充 + if (CollUtil.isEmpty(userIds)) { + userIds = Collections.singletonList(-1L); + } + lqw.in(WgzQuestionSavePdf::getUserId, userIds); + } + // 关联查询班组成员 + Long teamId = bo.getTeamId(); + if (teamId != null) { + List userIds = projectTeamMemberService.lambdaQuery() + .eq(BusProjectTeamMember::getTeamId, teamId) + .list() + .stream() + .map(BusProjectTeamMember::getMemberId) + .distinct() + .toList(); + // 如果 userIds 为空，就用一个不会命中的值填充 + if (CollUtil.isEmpty(userIds)) { + userIds = Collections.singletonList(-1L); + } + lqw.in(WgzQuestionSavePdf::getUserId, userIds); + } lqw.eq(bo.getUserId() != null, WgzQuestionSavePdf::getUserId, bo.getUserId()); lqw.eq(StringUtils.isNotBlank(bo.getPath()), WgzQuestionSavePdf::getPath, bo.getPath()); lqw.eq(StringUtils.isNotBlank(bo.getPass()), WgzQuestionSavePdf::getPass, bo.getPass()); lqw.eq(bo.getTimeOut() != null, WgzQuestionSavePdf::getTimeOut, bo.getTimeOut()); lqw.eq(bo.getTakeTime() != null, WgzQuestionSavePdf::getTakeTime, bo.getTakeTime()); lqw.eq(bo.getSumScore() != null, WgzQuestionSavePdf::getSumScore, bo.getSumScore()); + lqw.eq(bo.getProjectId() != null, WgzQuestionSavePdf::getProjectId, bo.getProjectId()); return lqw; }