From a9b9e12732839939239327e7aaa558e8f4733dc5 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Thu, 4 Dec 2025 15:55:31 +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 --- .../OutConstructionValueController.java | 2 +- .../OutConstructionValueRangeVo.java | 4 +-- .../service/IOutConstructionValueService.java | 10 ++++++- .../impl/OutConstructionValueServiceImpl.java | 16 ++++++++++- .../HazardHiddenDangerRectifyReviewReq.java | 28 +++++++++++++++++++ .../HazardHiddenDangerRectifyServiceImpl.java | 5 ++++ 6 files changed, 60 insertions(+), 5 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java index 4fb72a16..692ae045 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java @@ -54,7 +54,7 @@ public class OutConstructionValueController extends BaseController { @SaCheckPermission("out:constructionValue:list") @GetMapping("/totalList") public R> totalList(OutConstructionValueBo bo) { - List list = outConstructionValueService.queryList(bo); + List list = outConstructionValueService.queryTotalList(bo); return R.ok(list); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java index df3e3cd9..b9719c21 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java @@ -7,7 +7,7 @@ import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.out.domain.OutConstructionValueRange; -import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueTotalVo; +import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo; import java.io.Serial; import java.io.Serializable; @@ -82,6 +82,6 @@ public class OutConstructionValueRangeVo implements Serializable { /** * 子项列表 */ - private List constructionValueVoList; + private List constructionValueVoList; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueService.java index 5d81da02..bb01ffa1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueService.java @@ -48,7 +48,15 @@ public interface IOutConstructionValueService extends IService queryList(OutConstructionValueBo bo); + List queryTotalList(OutConstructionValueBo bo); + + /** + * 查询符合条件的施工产值列表 + * + * @param bo 查询条件 + * @return 施工产值列表 + */ + List queryList(OutConstructionValueBo bo); /** * 新增施工产值 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java index 888771c8..7b0e0ac0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java @@ -116,7 +116,7 @@ public class OutConstructionValueServiceImpl extends ServiceImpl queryList(OutConstructionValueBo bo) { + public List queryTotalList(OutConstructionValueBo bo) { Long projectId = bo.getProjectId(); if (projectId == null) { throw new ServiceException("请选择项目"); @@ -291,6 +291,20 @@ public class OutConstructionValueServiceImpl extends ServiceImpl queryList(OutConstructionValueBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List outConstructionValueVos = baseMapper.selectVoList(lqw); + supplementaryData(outConstructionValueVos); + return outConstructionValueVos; + } + private LambdaQueryWrapper buildQueryWrapper(OutConstructionValueBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/hiddendangerrectify/HazardHiddenDangerRectifyReviewReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/hiddendangerrectify/HazardHiddenDangerRectifyReviewReq.java index a64671d4..1d0bfd0c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/hiddendangerrectify/HazardHiddenDangerRectifyReviewReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/hiddendangerrectify/HazardHiddenDangerRectifyReviewReq.java @@ -1,5 +1,7 @@ package org.dromara.safety.domain.dto.hiddendangerrectify; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serial; @@ -15,5 +17,31 @@ public class HazardHiddenDangerRectifyReviewReq implements Serializable { @Serial private static final long serialVersionUID = 6999133950832111753L; + /** + * 主键 + */ + @NotNull(message = "请选择要复查的整改") + private Long id; + /** + * 整改人ID + */ + private Long rectifyUserId; + + /** + * 复查说明 + */ + @NotBlank(message = "请填写复查说明") + private String reviewDesc; + + /** + * 复查附件 + */ + private String reviewFiles; + + /** + * 复查状态(1待复查 2复查通过 3复查不通过) + */ + @NotBlank(message = "请选择复查状态") + private String reviewStatus; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HazardHiddenDangerRectifyServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HazardHiddenDangerRectifyServiceImpl.java index 50c6120c..fa1ef646 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HazardHiddenDangerRectifyServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HazardHiddenDangerRectifyServiceImpl.java @@ -152,6 +152,11 @@ public class HazardHiddenDangerRectifyServiceImpl extends ServiceImpl