Merge remote-tracking branch 'origin/dev' into dev

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<List<OutConstructionValueTotalVo>> totalList(OutConstructionValueBo bo) {
-        List<OutConstructionValueTotalVo> list = outConstructionValueService.queryList(bo);
+        List<OutConstructionValueTotalVo> list = outConstructionValueService.queryTotalList(bo);
         return R.ok(list);
     }
 

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<OutConstructionValueTotalVo> constructionValueVoList;
+    private List<OutConstructionValueVo> constructionValueVoList;
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueService.java

@@ -48,7 +48,15 @@ public interface IOutConstructionValueService extends IService<OutConstructionVa
      * @param bo 查询条件
      * @return 施工产值列表
      */
-    List<OutConstructionValueTotalVo> queryList(OutConstructionValueBo bo);
+    List<OutConstructionValueTotalVo> queryTotalList(OutConstructionValueBo bo);
+
+    /**
+     * 查询符合条件的施工产值列表
+     *
+     * @param bo 查询条件
+     * @return 施工产值列表
+     */
+    List<OutConstructionValueVo> queryList(OutConstructionValueBo bo);
 
     /**
      * 新增施工产值

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java

@@ -116,7 +116,7 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
      * @return 施工产值列表
      */
     @Override
-    public List<OutConstructionValueTotalVo> queryList(OutConstructionValueBo bo) {
+    public List<OutConstructionValueTotalVo> queryTotalList(OutConstructionValueBo bo) {
         Long projectId = bo.getProjectId();
         if (projectId == null) {
             throw new ServiceException("请选择项目");
@@ -291,6 +291,20 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
         }).toList();
     }
 
+    /**
+     * 查询符合条件的施工产值列表
+     *
+     * @param bo 查询条件
+     * @return 施工产值列表
+     */
+    @Override
+    public List<OutConstructionValueVo> queryList(OutConstructionValueBo bo) {
+        LambdaQueryWrapper<OutConstructionValue> lqw = buildQueryWrapper(bo);
+        List<OutConstructionValueVo> outConstructionValueVos = baseMapper.selectVoList(lqw);
+        supplementaryData(outConstructionValueVos);
+        return outConstructionValueVos;
+    }
+
     private LambdaQueryWrapper<OutConstructionValue> buildQueryWrapper(OutConstructionValueBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<OutConstructionValue> lqw = Wrappers.lambdaQuery();

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;
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HazardHiddenDangerRectifyServiceImpl.java

@@ -152,6 +152,11 @@ public class HazardHiddenDangerRectifyServiceImpl extends ServiceImpl<HazardHidd
      */
     @Override
     public Boolean rectification(HazardHiddenDangerRectifyRectificationReq req) {
+        Long id = req.getId();
+        HazardHiddenDangerRectify oldRectify = this.getById(id);
+        if (oldRectify == null) {
+            throw new ServiceException("未找到该数据");
+        }
         return null;
     }