From 6f4eb21debc9f980871f9dbe4b28ced1fd09f1a7 Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 8 Dec 2025 10:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HseDangerArchiveController.java | 12 ++++++ .../controller/HseSpecialPlanController.java | 10 +++++ .../domain/vo/HseDangerArchiveCountVo.java | 43 +++++++++++++++++++ .../domain/vo/HseSpecialPlanFileVo.java | 30 +++++++++++++ .../service/IHseDangerArchiveService.java | 9 ++++ .../service/IHseSpecialPlanService.java | 7 +++ .../impl/HseDangerArchiveServiceImpl.java | 31 ++++++++++++- .../impl/HseSpecialPlanServiceImpl.java | 11 +++++ 8 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseDangerArchiveCountVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseSpecialPlanFileVo.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDangerArchiveController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDangerArchiveController.java index 6571c294..39474a5f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDangerArchiveController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDangerArchiveController.java @@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.safety.domain.vo.HseDangerArchiveCountVo; +import org.dromara.safety.domain.vo.HseSpecialPlanCountVo; import org.dromara.safety.domain.vo.HseJsjdYuJkjcVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -113,4 +115,14 @@ public class HseDangerArchiveController extends BaseController { @PathVariable Long[] ids) { return toAjax(hseDangerArchiveService.deleteWithValidByIds(List.of(ids), true)); } + + + /** + * 统计 + */ + @GetMapping("/count/{projectId}") + public R count(@PathVariable Long projectId) { + return R.ok(hseDangerArchiveService.count(projectId)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSpecialPlanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSpecialPlanController.java index 6712552a..ec8be4fa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSpecialPlanController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSpecialPlanController.java @@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.safety.domain.vo.HseSpecialPlanCountVo; +import org.dromara.safety.domain.vo.HseSpecialPlanFileVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -112,4 +113,13 @@ public class HseSpecialPlanController extends BaseController { public R count(@PathVariable Long projectId) { return R.ok(hseSpecialPlanService.count(projectId)); } + + + /** + * 获取档案 + */ + @GetMapping("/getFile/{deId}") + public R getFile(@PathVariable Long deId) { + return R.ok(hseSpecialPlanService.getFile(deId)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseDangerArchiveCountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseDangerArchiveCountVo.java new file mode 100644 index 00000000..edcd40b3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseDangerArchiveCountVo.java @@ -0,0 +1,43 @@ +package org.dromara.safety.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.safety.domain.HseDangerArchive; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; + + +/** + * 危大工程档案视图对象 hse_danger_archive + * + * @author Lion Li + * @date 2025-12-06 + */ +@Data +public class HseDangerArchiveCountVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + + /** + * 总工程数 + */ + private Integer total; + + /** + * 重大风险数 + */ + private Long majorRisk; + /** + * 归档数 + */ + private Integer archive; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseSpecialPlanFileVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseSpecialPlanFileVo.java new file mode 100644 index 00000000..8dd5e8ea --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseSpecialPlanFileVo.java @@ -0,0 +1,30 @@ +package org.dromara.safety.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 危大工程专项施工方案视图对象 hse_special_plan + * + * @author Lion Li + * @date 2025-12-06 + */ +@Data +public class HseSpecialPlanFileVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 专家结论附件路径 + */ + private String expertFile; + + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDangerArchiveService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDangerArchiveService.java index 01a06c03..3c79fde7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDangerArchiveService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDangerArchiveService.java @@ -1,5 +1,6 @@ package org.dromara.safety.service; +import org.dromara.safety.domain.vo.HseDangerArchiveCountVo; import org.dromara.safety.domain.vo.HseDangerArchiveVo; import org.dromara.safety.domain.bo.HseDangerArchiveBo; import org.dromara.safety.domain.HseDangerArchive; @@ -9,6 +10,8 @@ import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.safety.domain.vo.HseJsjdYuJkjcVo; +import org.springframework.web.bind.annotation.PathVariable; + import java.util.Collection; import java.util.List; @@ -70,5 +73,11 @@ public interface IHseDangerArchiveService extends IService{ */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 统计 + */ + HseDangerArchiveCountVo count( Long projectId); + HseJsjdYuJkjcVo getJsjdYGcjk(Long id); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSpecialPlanService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSpecialPlanService.java index 76ad5ee7..bde39c1b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSpecialPlanService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSpecialPlanService.java @@ -1,6 +1,7 @@ package org.dromara.safety.service; import org.dromara.safety.domain.vo.HseSpecialPlanCountVo; +import org.dromara.safety.domain.vo.HseSpecialPlanFileVo; import org.dromara.safety.domain.vo.HseSpecialPlanVo; import org.dromara.safety.domain.bo.HseSpecialPlanBo; import org.dromara.safety.domain.HseSpecialPlan; @@ -75,4 +76,10 @@ public interface IHseSpecialPlanService extends IService{ * 统计 */ HseSpecialPlanCountVo count(Long projectId); + + /** + * 获取档案 + */ + HseSpecialPlanFileVo getFile(Long deId); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java index ef16c3f4..d65c69af 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java @@ -1,6 +1,9 @@ package org.dromara.safety.service.impl; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -9,6 +12,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.safety.domain.HseDangerousEngineering; +import org.dromara.safety.domain.vo.HseDangerArchiveCountVo; +import org.dromara.safety.service.IHseDangerousEngineeringService; import org.dromara.safety.domain.vo.HseJsjdYuJkjcVo; import org.dromara.safety.gcjkjl.domain.HseGcjk; import org.dromara.safety.gcjkjl.service.IHseGcjkService; @@ -39,6 +45,8 @@ public class HseDangerArchiveServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); @@ -144,7 +155,12 @@ public class HseDangerArchiveServiceImpl extends ServiceImpl 0; } + @Override + public HseDangerArchiveCountVo count(Long projectId) { + HseDangerArchiveCountVo hseDangerArchiveCountVo = new HseDangerArchiveCountVo(); + List list = hseDangerousEngineeringService.lambdaQuery() + .eq(HseDangerousEngineering::getProjectId, projectId) + .list(); + hseDangerArchiveCountVo.setTotal(list.size()); + hseDangerArchiveCountVo.setMajorRisk(list.stream().filter(item -> "4".equals(item.getRiskLevel())).count()); + List list1 = lambdaQuery().eq(HseDangerArchive::getProjectId, projectId).list(); + hseDangerArchiveCountVo.setArchive(list1.size()); + return hseDangerArchiveCountVo; + } + @Override public HseJsjdYuJkjcVo getJsjdYGcjk(Long id) { HseJsjdYuJkjcVo hseJsjdYuJkjcVo = new HseJsjdYuJkjcVo(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSpecialPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSpecialPlanServiceImpl.java index c7ea3b51..bd718b6e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSpecialPlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSpecialPlanServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.safety.domain.vo.HseSpecialPlanCountVo; +import org.dromara.safety.domain.vo.HseSpecialPlanFileVo; import org.dromara.safety.service.IHseDangerousEngineeringService; import org.springframework.stereotype.Service; import org.dromara.safety.domain.bo.HseSpecialPlanBo; @@ -182,4 +183,14 @@ public class HseSpecialPlanServiceImpl extends ServiceImpl item.getNeedSupervision() == 1).count()); return vo; } + + @Override + public HseSpecialPlanFileVo getFile(Long deId) { + HseSpecialPlan one = lambdaQuery().eq(HseSpecialPlan::getDeId, deId).last("limit 1").one(); + HseSpecialPlanFileVo hseSpecialPlanFileVo = new HseSpecialPlanFileVo(); + if(one != null) { + hseSpecialPlanFileVo.setExpertFile(one.getExpertFile()); + } + return hseSpecialPlanFileVo; + } }